Merge remote-tracking branch 'origin/main' · ee27a573e3 - Gogs

Merge remote-tracking branch 'origin/main'

# Conflicts:
#	file.txt

Arseniy 5 months ago

parent

cf80004074 d7b35b69a2

commit

ee27a573e3

1 changed files with 1 additions and 3 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 3
						
file.txt
							 
								View File
							
				@@ -1,6 +1,4 @@
			
				 File
			
				 branch_1 changes
			
				 1
			
				-2
			
				-3
			
				-4
			
				+2