Fix changelog merges

This commit is contained in:
Willy-JL
2024-07-05 17:31:00 +02:00
parent 4c7b0f3863
commit 967c16d52e
4 changed files with 3 additions and 3 deletions

2
.gitattributes vendored
View File

@@ -3,4 +3,4 @@
*.ps1 eol=crlf
*.cmd eol=crlf
ReadMe.md merge=ours
ChangeLog.md merge=ours
CHANGELOG.md merge=ours