From 3e8d6e56173cd157987056809b00f48e2c0e653b Mon Sep 17 00:00:00 2001
From: lc <583848597@qq.com>
Date: Wed, 7 Aug 2024 16:20:37 +0800
Subject: [PATCH] e3e3e

---
 test123.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test123.txt b/test123.txt
index 026628f..7d95326 100644
--- a/test123.txt
+++ b/test123.txt
@@ -1,7 +1,3 @@
 teste243434
 
-<<<<<<< HEAD
 branch2 22
-=======
-branch1
->>>>>>> 47809d15fb6d3880139f8129840abbcf1df785a1