diff --git a/111.txt b/111.txt index e49f542..85221a5 100644 --- a/111.txt +++ b/111.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD 111 -Developing -======= -111 ->>>>>>> ee00edbf5aacf24ba3e3c0b7dc2594c13921b994 +Develop \ No newline at end of file