From 5e4ce2596377fbed7494659c4c4fb05b0d9fe6b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B9=BC=E8=8F=9C=E5=B9=BC=E7=88=B1=E7=8E=A9?=
 <2267208335@qq.com>
Date: Wed, 18 Sep 2024 20:58:33 +0800
Subject: [PATCH 1/2] fuck

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

diff --git a/README.md b/README.md
index f3c02dc..d277277 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-# exercise2_GitPR
-用来进行测试的Readme，同学们可以对其进行修改后发起PR请求
-
-比如说我在这里加入一行新的并提交
+# exercise2_GitPR
+用来进行测试的Readme，同学们可以对其进行修改后发起PR请求
+
+比如说我在这里加入一行新的并提交
+add someting interesting to this file

From 0751cdadb9986fea817b79efb45da262b0dfbd02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B9=BC=E8=8F=9C=E5=B9=BC=E7=88=B1=E7=8E=A9?=
 <2267208335@qq.com>
Date: Thu, 19 Sep 2024 10:04:06 +0800
Subject: [PATCH 2/2] Add files via upload

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d277277..03cc1eb 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,10 @@
 用来进行测试的Readme，同学们可以对其进行修改后发起PR请求
 
 比如说我在这里加入一行新的并提交
-add someting interesting to this file
+<<<<<<< HEAD
+add someting interesting to this file
+add someting interesting to this file
+=======
+
+add something new 233333
+>>>>>>> 4af3e91b8c698f13c9585b9abcfd43852e9c5d3e