Merge pull request #323 from joshuaboniface/gitattributes

Add merge=union for CONTRIBUTORS.md

This commit is contained in:

Joshua M. Boniface

2018-12-30 00:46:29 -05:00

committed by

GitHub

parent 9d91fa8ab8 b306758836

commit d10d632c48

1 changed files with 1 additions and 0 deletions

.gitattributes

View File

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