From 5c87c415c1c078e41ed9edb9d92c974d26f465ac Mon Sep 17 00:00:00 2001
From: songhp <songhp@ujs.edu.cn>
Date: Tue, 23 Aug 2022 19:33:54 +0800
Subject: [PATCH] 333

---
 git.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/git.txt b/git.txt
index 8216c7c..67bb44d 100644
--- a/git.txt
+++ b/git.txt
@@ -1,8 +1,6 @@
 git show
 111
-<<<<<<< HEAD
 333
-=======
 222
->>>>>>> 3ad949782ad2b22ac1b9cef7521ec0506c2e6ea7
+