Prevent constant CHANGELOG.md merge conflicts by using union merge …

…driver (ldc-developers#3973)
Inochi2D · Apr 28, 2022 · aa039aa · aa039aa
1 parent a21c0bf
commit aa039aa
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,3 +3,4 @@
 
 .gitattributes export-ignore
 .travis.yml export-ignore
+CHANGELOG.md text merge=union