HOUYT 7 years ago
parent
commit
ae6f8aeee8
1 changed files with 1 additions and 2 deletions
  1. 1 2
      daima.txt

+ 1 - 2
daima.txt

@@ -3,5 +3,4 @@ vbsjdkbvjk sb jk1
 =======
 =======
 jhhf jkhh kng
->>>>>>> .theirshbmn
-dghf sdjk kVNKvnskdn
+>>>>>>> .theirsgs