Browse Source

Add merge=union for CONTRIBUTORS.md

Joshua Boniface 6 years ago
parent
commit
b306758836
1 changed files with 1 additions and 0 deletions
  1. 1 0
      .gitattributes

+ 1 - 0
.gitattributes

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