home/telegraf
2
0
Fork 0
mirror of https://github.com/wahyd4/telegraf.git synced 2026-08-08 20:35:42 +10:00
Code Issues Packages Projects Releases Wiki Activity

update gitattributes for easier fork mngmnt

Browse Source
This commit is contained in:
Cameron Sparr
2016-06-01 16:18:17 +01:00
parent 52b9fc837c
commit fb5f40319e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+3 -1
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