dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update gitattributes for easier fork mngmnt

This commit is contained in:
Cameron Sparr 2016-06-01 15:10:57 +01:00
parent 52b9fc837c
commit fb5f40319e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -1,2 +1,4 @@
CHANGELOG.md merge=union
README.md merge=union
plugins/inputs/all/all.go merge=union
plugins/outputs/all/all.go merge=union