Add .gitattributes, prevent conflicts on CHANGELOG.md

1 year ago · 4a1ae9798a
parent 9c3bd08f8d
commit 4a1ae9798a
1 changed files with 1 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+CHANGELOG.md merge=union