Allowed union merge strategy in CHANGES.rst.

[ci skip]
plone · Oct 24, 2015 · 61c58c9 · 61c58c9
1 parent af25469
commit 61c58c9
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGES.rst merge=union