Update git attributes for changelog-ee

0f579375 · Marin Jankovski · 911649b6 · 0f579375
Commit 0f579375 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