From 4868afc1b922f80e114899d57591b4f8feaa39bc Mon Sep 17 00:00:00 2001
From: yuankaihao <2649400527@qq.com>
Date: Sun, 16 Apr 2023 16:11:58 +0800
Subject: [PATCH] 123

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

diff --git a/README.md b/README.md
index 1ffbe1a..bef980f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # 学生成绩管理系统
 
-<<<<<<< HEAD
+
 ## 
 .....
-=======
+