1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 212566614..7e800609e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-* text=auto
-\ No newline at end of file
+CHANGELOG merge=union
+\ No newline at end of file