merge master

571255945 · Apr 17, 2022 · 2b30ffb · 2b30ffb
2 parents 1da70be + 753d48a
commit 2b30ffb
Show file tree

Hide file tree

Showing 2 changed files with 121 additions and 0 deletions.
diff --git a/readme.txt b/readme.txt
@@ -1,4 +1,8 @@
+
 read
 dev2
 dev2
 
+master
+readme.txt
+
diff --git a/v2.txt b/v2.txt
@@ -1 +1,118 @@
+<<<<<<< HEAD
 v2
+=======
+111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+:111
+ttttttttttttttttttttttttt
+999999dfadfa
+ttt
+>>>>>>> master