.gitattributes: a CHANGELOG conflict keeps both sides' lines
ci / test (pull_request) Successful in 44s
ci / test (pull_request) Successful in 44s
This commit is contained in:
1 parent
c95e1accc1
commit
51f8e484e9
1 file changed
+1
@@ -0,0 +1 @@
|
||||
CHANGELOG.md merge=union
|
||||
Reference in new issue
Block a user