tests: beware that clang warns about "#define private public"

[bison.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index e8495d51e95dfe0e0a62869ac033aebd0beab890..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-ChangeLog merge=merge-changelog
+