Specify merge driver for changelog to avoid text conflicts

yernero · Mar 25, 2016 · 277177f · 277177f
1 parent 6505fa1
commit 277177f
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/CHANGELOG.md merge=union