From 78ecc7632fadafa25cad6d8f6db4359ae551e86f Mon Sep 17 00:00:00 2001
From: hftian <hftian@yzu.edu.cn>
Date: Thu, 8 Aug 2024 16:34:08 +0800
Subject: [PATCH] tian1

---
 doc/1.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/doc/1.txt b/doc/1.txt
index 72ac5b3..a0fe494 100644
--- a/doc/1.txt
+++ b/doc/1.txt
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
 111
 222
-=======
-222
-333
->>>>>>> main
+