remove union merge attr

This commit is contained in:
David Lord 2019-06-23 16:25:40 -07:00
parent 185d7cbab2
commit dbe51dc09d
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8

1
.gitattributes vendored
View file

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