From 78517b3a492630aae1e759bca60beb6fad1eae42 Mon Sep 17 00:00:00 2001
From: ychashub <912355998@qq.com>
Date: Wed, 24 Aug 2022 01:47:58 +0000
Subject: [PATCH 1/4] update test.md.

Signed-off-by: ychashub <912355998@qq.com>
---
 test.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test.md b/test.md
index 9daeafb..b5a14bb 100644
--- a/test.md
+++ b/test.md
@@ -1 +1,4 @@
 test
+
+
+master
\ No newline at end of file
-- 
Gitee


From d47f07491d10817ecd362948001e582f912a2b31 Mon Sep 17 00:00:00 2001
From: hashub <912355998@qq.com>
Date: Wed, 24 Aug 2022 10:05:45 +0800
Subject: [PATCH 2/4] test.md

---
 test.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test.md b/test.md
index 7076dd7..ff22506 100644
--- a/test.md
+++ b/test.md
@@ -1,11 +1,8 @@
 test
 
 
-<<<<<<< HEAD
 master
-=======
 
 
 
 dev
->>>>>>> dev
-- 
Gitee


From 7912d6815d7d6cead3d3a4d9bc8b70dc897aaf4a Mon Sep 17 00:00:00 2001
From: hashub <912355998@qq.com>
Date: Wed, 24 Aug 2022 10:14:33 +0800
Subject: [PATCH 3/4] master

---
 test.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test.md b/test.md
index ff22506..1d03ef6 100644
--- a/test.md
+++ b/test.md
@@ -2,7 +2,3 @@ test
 
 
 master
-
-
-
-dev
-- 
Gitee


From d424b7c5199f4eb62874906732170aa39531e86c Mon Sep 17 00:00:00 2001
From: hashub <912355998@qq.com>
Date: Wed, 24 Aug 2022 10:20:49 +0800
Subject: [PATCH 4/4] 1

---
 test.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test.md b/test.md
index d157ece..1d03ef6 100644
--- a/test.md
+++ b/test.md
@@ -2,6 +2,3 @@ test
 
 
 master
-
-
-dev
-- 
Gitee