# http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/
/CHANGELOG.md merge=union
