Merge pull request #751 from mslacken/development

use union strategy for CHANGELOG.md
This commit is contained in:
Christian Goll
2023-03-22 21:19:17 +01:00
committed by GitHub

1
.gitattributes vendored Normal file
View File

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