From 5eac7d3718ecd16f16e554e42c5f8b8fb02a963d Mon Sep 17 00:00:00 2001
From: Cristine <791655605@qq.com>
Date: Tue, 4 Feb 2025 21:08:20 +1100
Subject: [PATCH 1/2] edit README.md rebase

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fe4a557..f65d4d4 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,6 @@ Richard Visited
 
 feature10 OhNo
 
-feature to hotfix-YPJ
-
 kkk
+
+YJ-rebase
\ No newline at end of file

From fece80223caf2f91a6cdc65605086e0537ebe5a5 Mon Sep 17 00:00:00 2001
From: Cristine <791655605@qq.com>
Date: Tue, 4 Feb 2025 21:16:02 +1100
Subject: [PATCH 2/2] edit README.md again

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 45fef3c..f13d004 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ feature10 OhNo
 
 kkk
 
+<<<<<<< HEAD
 
 YJ-rebase
 
@@ -12,3 +13,6 @@ YJ-rebase
 sd
 s
 
+=======
+YJ-rebase-push
+>>>>>>> e7f4e29 (edit README.md again)