Remove gitattribute entry for CHANGELOG.md

[ci skip]
2016-11-15 17:04:33 +02:00 · 2016-11-15 17:04:33 +02:00 · 5918943838
parent 37abb20cec
commit 5918943838
1 changed files with 0 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,2 +1 @@
-CHANGELOG.md merge=union
 *.js.es6 gitlab-language=javascript