# Conflicts: # daima.txt
@@ -1 +1,5 @@
+<<<<<<< .mine
vbsjdkbvjk sb jk1
+=======
+jhhf jkhh kng
+>>>>>>> .theirs
