2 gadi atpakaļ · ccbed17ded
--- a/test.md
+++ b/test.md
@@ -1,7 +1,4 @@
 
				 # test1
			
 
				-<<<<<<< HEAD
			
 
				+# test2
			
 
				 # test3
			
 
				-=======
			
 
				 
			
 
				-# test2
			
 
				->>>>>>> 96de58a09ef476f2db8eeeea432b059d103fde77