Allowed union merge strategy in CHANGES.rst.

[ci skip]

This commit is contained in:

Maurits van Rees

2015-10-25 00:00:19 +02:00

parent e168ca18b9

commit 69cc6a7f25

1 changed files with 1 additions and 0 deletions

.gitattributes

View File

				`@@ -0,0 +1 @@`
				`CHANGES.rst merge=union`