From 1faf6c02d20481e3d45a8ac7fb9270dd37e79e23 Mon Sep 17 00:00:00 2001
From: pah5rctm2 <85450702@qq.com>
Date: Thu, 25 Aug 2022 21:52:32 +0800
Subject: [PATCH] Update newfile2.txt

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

diff --git a/newfile2.txt b/newfile2.txt
index 1d941b7..0a7f159 100644
--- a/newfile2.txt
+++ b/newfile2.txt
@@ -1,6 +1,4 @@
 new file2
-<<<<<<< HEAD
 uuuuuuuu
-=======
 wwwwwwww
->>>>>>> 53ae6021d868f894eecda7cc3f547533910ccbf8
+