Files
telegraf/.gitattributes
2016-06-01 16:18:17 +01:00

5 lines
124 B
Plaintext

CHANGELOG.md merge=union
README.md merge=union
plugins/inputs/all/all.go merge=union
plugins/outputs/all/all.go merge=union