From 2004c394b82b5eb62015eb162009bc7d93e01869 Mon Sep 17 00:00:00 2001
From: liuyt <3038118703@qq.com>
Date: Sun, 22 Sep 2024 17:23:15 +0800
Subject: [PATCH] PR

---
 doc/111.txt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/doc/111.txt b/doc/111.txt
index 41e8b00..ffd78ec 100644
--- a/doc/111.txt
+++ b/doc/111.txt
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 111
-=======
-111
-branch
-pull request
->>>>>>> liuyutin_branch
+branch1
+branch2
+pull request
\ No newline at end of file