telegraf/.gitattributes

5 lines
124 B
Plaintext
Raw Permalink Normal View History

2016-04-22 17:20:25 +00:00
CHANGELOG.md merge=union
README.md merge=union
plugins/inputs/all/all.go merge=union
plugins/outputs/all/all.go merge=union