diff --git a/33222tt b/33222tt
index 8e7eef4..242c566 100644
--- a/33222tt
+++ b/33222tt
@@ -1,6 +1,3 @@
 
 <<<<<<< HEAD
 "lalalalal"  
-=======
-第三方第三方
->>>>>>> a9a5abe543686de03d60d81efc17f6be0e24ecd0