Merge branch 'rs-disable-changelog-merge-ee' into 'master'

Remove gitattribute entry for CHANGELOGs This should no longer be necessary now that we've got automatic changelogs! See merge request !874

Merge branch 'rs-disable-changelog-merge-ee' into 'master'
Remove gitattribute entry for CHANGELOGs This should no longer be necessary now that we've got automatic changelogs! See merge request !874
5d9e8c09 · Dmitriy Zaporozhets · 74e7f50a · 60df849c · 5d9e8c09
Commit 5d9e8c09 authored Nov 16, 2016 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

.gitattributes .gitattributes +0 -2

No files found.
--- a/.gitattributes
+++ b/.gitattributes
-CHANGELOG.md merge=union
-CHANGELOG-EE.md merge=union
 *.js.es6 gitlab-language=javascript