Add .gitattributes, prevent conflicts on CHANGELOG.md
This commit is contained in:
parent
9c3bd08f8d
commit
4a1ae9798a
|
@ -0,0 +1 @@
|
|||
CHANGELOG.md merge=union
|
Loading…
Reference in New Issue