From 43e58ebe89f2c7c2d61c77e6be5720cf8ae8a5ea Mon Sep 17 00:00:00 2001
From: aaotsadmin <shouqingp2p@gmail.com>
Date: Wed, 10 Jun 2026 08:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'README.md'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/README.md b/README.md
index 04f2efc..1c56b10 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # 学生信息管理系统 v2.0
 
 基于 **JSP + Servlet + JavaBean + JDBC + DAO + Service** 架构的全功能学生信息管理系统。
@@ -116,4 +115,3 @@ http://localhost:8080/student-management/
 # student-management
 
 学生管理系统作业
->>>>>>> 199973ecc1a80cb639a57f856f6f18735ccff863