8 år sedan · 9379bca7d1
--- a/daima.txt
+++ b/daima.txt
@@ -1,5 +1,6 @@
 
				 <<<<<<< .mine
			
 
				 vbsjdkbvjk sb jk1
			
 
				 =======
			
 
				+=======
			
 
				 jhhf jkhh kng
			
 
				->>>>>>> .theirs
			
 
				+>>>>>>> .theirshbmn