Add .gitattributes, prevent conflicts on CHANGELOG.md

This commit is contained in:
Alex Gleason
2022-12-14 17:44:16 -06:00
parent 9c3bd08f8d
commit 4a1ae9798a

1
.gitattributes vendored Normal file
View File

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