Fix gitattributes

badger-cash · Jun 30, 2016 · 9a8ede2 · 9a8ede2
1 parent ab5730a
commit 9a8ede2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-CHANGELOG merge=union
+CHANGELOG.md merge=union