develop

3 years ago · 2e4c9a2576
parent 8160486b2e
commit 2e4c9a2576
1 changed files with 1 additions and 5 deletions
--- a/111.txt
+++ b/111.txt
@ -1,7 +1,3 @@
-<<<<<<< HEAD
 111

-Developing
-=======
-111
->>>>>>> ee00edbf5aacf24ba3e3c0b7dc2594c13921b994
+Develop