merge error test · 58feb88bba - G-Node GIN

merge error test

julien colomb 3 years ago

parent

a17c2e66c7

commit

58feb88bba

1 changed files with 2 additions and 1 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 1
						
README.md
							 
								View File
							
				@@ -1,3 +1,4 @@
			
				 # Rrepo1_manu
			
				-adding some text for testing 3
			
				+adding some text for testing 3
			
				+mergeerror