Add merge=union for CONTRIBUTORS.md

5 years ago · b306758836
parent aac1007bdc
commit b306758836
1 changed files with 1 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+CONTRIBUTORS.md merge=union