.gitattributes: a CHANGELOG conflict keeps both sides' lines
This commit is contained in:
1 parent
662e495d80
commit
eaa5455ee9
1 file changed
+1
@@ -0,0 +1 @@
|
||||
CHANGELOG.md merge=union
|
||||
Reference in new issue
Block a user