1 · bbead0cee5 - Gogs

1

guhongwei 2 years ago

parent

9a32c7d6f6

commit

bbead0cee5

1 changed files with 2 additions and 1 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 1
						
.gitattributes
							 
								View File
							
				@@ -1 +1,2 @@
			
				-config/** merge=ours
			
				+config/** merge=ours
			
				+ecosystem.config.js merge=ours