remove union merge attr

This commit is contained in:
David Lord 2019-06-23 16:25:40 -07:00
parent 2143807952
commit 7a503ef367

1
.gitattributes vendored
View file

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