diff --git a/3.txt b/3.txt deleted file mode 100644 index 1c533aa..0000000 --- a/3.txt +++ /dev/null @@ -1,7 +0,0 @@ -<<<<<<< HEAD -33 -33 -======= -3333 ->>>>>>> parent of 48fb98a (1) -456 \ No newline at end of file