forked from mirrors/cobblemon
Changed CHANGELOG.md merge strategy
This commit is contained in:
@@ -3,3 +3,4 @@
|
||||
# are changed when only line endings change.
|
||||
src/generated/**/.cache/cache text eol=lf
|
||||
src/generated/**/*.json text eol=lf
|
||||
CHANGELOG.md merge=union
|
||||
Reference in New Issue
Block a user