Merge pull request #323 from joshuaboniface/gitattributes · d10d632c48 - Gogs

Merge pull request #323 from joshuaboniface/gitattributes

Add merge=union for CONTRIBUTORS.md

Joshua M. Boniface 6 years ago

parent

9d91fa8ab8 b306758836

commit

d10d632c48

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

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