add gitattributes file

This commit is contained in:
Cameron Sparr
2016-04-22 11:20:25 -06:00
parent 23f2b47531
commit 1b083d63ab

2
.gitattributes vendored Normal file
View File

@@ -0,0 +1,2 @@
CHANGELOG.md merge=union