From de4c348189cb80caf13169535913ea35721aa632 Mon Sep 17 00:00:00 2001
From: Heyukai <1626784885@qq.com>
Date: Sun, 12 Mar 2023 19:36:47 +0800
Subject: [PATCH] Conflict Solved

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e4c7640..b638918 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
 # BUAA-SE-2023-Lab01-Group20
-1
+