Merge pull request #19 from JustAMan/git-attrs

Set union merge for CONTRIBUTORS.md

This commit is contained in:

Joshua M. Boniface

2019-01-11 22:08:40 -05:00

committed by

GitHub

parent 754d68a286 525ad1cfc5

commit 6a15a98e28

1 changed files with 1 additions and 0 deletions

.gitattributes

View File

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