Adds a gitattribute file to manage changelog merges

This commit is contained in:
Jeff Boek 2019-04-10 13:44:55 -07:00 committed by Colin Lee
parent 4c43ff09a8
commit 7e6d911657
1 changed files with 1 additions and 0 deletions

1
.gitattributes vendored Normal file
View File

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