X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/fdd2c97c0b6673599d2d1ea030980799a6abbb59..7601a471f5b0dee063748c5d4383bc03c6313164:/.gitattributes

diff --git a/.gitattributes b/.gitattributes
index e8495d51..8b137891 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-ChangeLog merge=merge-changelog
+