chore(.gitattributes): use union merge strategy for doc/changes.md

No more changelog merge conflicts \o/
leodemoura · Dec 11, 2017 · 205fbd8 · 205fbd8
1 parent f1510a8
commit 205fbd8
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+doc/changes.md merge=union