Set merge strategy to union for HISTORY.rst

Thus, we should have less conflicts on merges.
camptocamp · Jul 26, 2016 · 61addb4 · 61addb4
1 parent 1c7ad72
commit 61addb4
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+HISTORY.rst       merge=union