Add merge=union for CONTRIBUTORS.md

This commit is contained in:
Joshua Boniface 2018-12-29 19:35:42 -05:00
parent aac1007bdc
commit b306758836

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
CONTRIBUTORS.md merge=union