tyr two

daima.txt

@@ -1,5 +1,6 @@
 <<<<<<< .mine
 vbsjdkbvjk sb jk1
 =======
+=======
 jhhf jkhh kng
->>>>>>> .theirs
+>>>>>>> .theirshbmn