update gitattributes for easier fork mngmnt
This commit is contained in:
parent
52b9fc837c
commit
fb5f40319e
|
@ -1,2 +1,4 @@
|
||||||
CHANGELOG.md merge=union
|
CHANGELOG.md merge=union
|
||||||
|
README.md merge=union
|
||||||
|
plugins/inputs/all/all.go merge=union
|
||||||
|
plugins/outputs/all/all.go merge=union
|
||||||
|
|
Loading…
Reference in New Issue