Allowed union merge strategy in CHANGES.rst.

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