Remove union merge causing many duplicates

JabRef · May 11, 2016 · ac08efb · ac08efb
1 parent cd7a992
commit ac08efb
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,6 +5,3 @@ gradlew eol=lf
 # ensure that line endings of *.java and *.properties are normalized
 *.properties text
 *.java text
-
-# ensure that CHANGELOG entries are merged instead of causing conflicts
-CHANGELOG.md merge=union