From 0a1d15112c8800542b9cd5a52fec7f86b9f574f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxinle=E2=80=9D?= <112196496@qq.com>
Date: Wed, 23 Feb 2022 15:33:23 +0800
Subject: [PATCH] 4444

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

diff --git a/4.txt b/4.txt
index 9e0deb0..1b82438 100644
--- a/4.txt
+++ b/4.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-224444
-=======
-4444
->>>>>>> 添加内容：4444
+4444
\ No newline at end of file