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

Remove gitattribute entry for CHANGELOG.md This should no longer be necessary now that we've got automatic changelogs! See merge request !7479

Merge branch 'rs-disable-changelog-merge' into 'master'
Remove gitattribute entry for CHANGELOG.md This should no longer be necessary now that we've got automatic changelogs! See merge request !7479
05be65f3 · Dmitriy Zaporozhets · 0a3cafb2 · 59189438 · 05be65f3
Commit 05be65f3 authored Nov 16, 2016 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

.gitattributes .gitattributes +0 -1

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