Merge branch 'gitattributes_ee_changelog_update' into 'master'

Update git attributes for changelog-ee See merge request !337

Merge branch 'gitattributes_ee_changelog_update' into 'master'
Update git attributes for changelog-ee See merge request !337
fe51c666 · Marin Jankovski · 911649b6 · 0f579375 · fe51c666
Commit fe51c666 authored Mar 03, 2015 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.gitattributes .gitattributes +2 -1

No files found.
--- a/.gitattributes
+++ b/.gitattributes
-CHANGELOG merge=union
\ No newline at end of file
+CHANGELOG merge=union
+CHANGELOG-EE merge=union