telegraf/.gitattributes

CHANGELOG.md merge=union
README.md merge=union
plugins/inputs/all/all.go merge=union
plugins/outputs/all/all.go merge=union
add gitattributes file 2016-04-22 17:20:25 +00:00			`CHANGELOG.md merge=union`
update gitattributes for easier fork mngmnt 2016-06-01 14:10:57 +00:00			`README.md merge=union`
			`plugins/inputs/all/all.go merge=union`
			`plugins/outputs/all/all.go merge=union`