Merge branch master · 94c6bf3d9e - Gogs: Go Git Service

Merge branch master

Bachir Soussi Chiadmi 7 years ago

parent

cd579b801d c3efbc0d14

commit

94c6bf3d9e

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
first-page.md
							 
								View File
							
				@@ -11,5 +11,5 @@ ok i can pull
			
				 and what about conflicts ?
			
				-
			
				+here is what would cause a conflict hehe.