Changed CHANGELOG.md merge strategy

This commit is contained in:
apion
2024-05-29 22:06:53 -04:00
parent d04ed7a519
commit fe3d8d3185
+1
View File
@@ -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