aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 7e800609e..a19ade077 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-CHANGELOG merge=union \ No newline at end of file
+CHANGELOG.md merge=union