CHANGELOG.md should now be correctly merged (union)

ruytakata · Nov 14, 2015 · 2361ab6 · 2361ab6
1 parent e7d6661
commit 2361ab6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,4 @@
 gradlew eol=lf
 *.sh eol=lf
 
-CHANGELOG merge=union
+CHANGELOG.md merge=union