Merge pull request #751 from mslacken/development
use union strategy for CHANGELOG.md
This commit is contained in:
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
CHANGELOG.md merge=union
|
||||
Reference in New Issue
Block a user