Add gitattributes file for CHANGES.md to avoid merge conflicts
This commit is contained in:
parent
41990cf60f
commit
38872f151d
|
@ -0,0 +1 @@
|
||||||
|
CHANGES.md merge=union
|
Loading…
Reference in New Issue