chore(git): ignore merge conflicts for CHANGELOG.md

This commit is contained in:
2025-05-10 17:25:51 +02:00
parent 32f3fe5f52
commit d04dfcd63e

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
CHANGELOG.md merge=ours