chore: try to improve deconflicting with CHANGELOG (#9402)

flybywiresim · Nov 5, 2024 · 3f289ac · 3f289ac
1 parent fe5e0fb
commit 3f289ac
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -8,3 +8,6 @@
 # line endings.
 /fbw-a32nx/src/localization/flypad/*.json text eol=lf
 /fbw-a32nx/src/localization/msfs/*.locPak text eol=lf
+
+# try to deconflict changelog
+.github/CHANGELOG.md merge=union