From e435fb9a7fe79a0fc8deff7d12cc425608778497 Mon Sep 17 00:00:00 2001
From: leikuanlin <2838647995@qqleikuanlincom>
Date: Mon, 17 Mar 2025 18:42:31 +0800
Subject: [PATCH] =?UTF-8?q?docs:=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=EF=BC=8CMUA=E8=81=94=E7=9B=9F=E6=95=B0=E7=BB=84=E5=90=AB?=
 =?UTF-8?q?=E4=B9=89=E3=80=81=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=BA=A6=E3=80=81?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E5=8A=9F=E8=83=BD=E3=80=81Developme?=
 =?UTF-8?q?nt=20Plan?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/notes/项目文档/CQMUA服务器中心/README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/notes/项目文档/CQMUA服务器中心/README.md b/docs/notes/项目文档/CQMUA服务器中心/README.md
index 634c67a..30f0683 100644
--- a/docs/notes/项目文档/CQMUA服务器中心/README.md
+++ b/docs/notes/项目文档/CQMUA服务器中心/README.md
@@ -30,6 +30,7 @@ Alliance，是重庆市高校的Minecraft联盟。CQMUA的本质是借助Minecra
 
 - 完成前端页面、UI的设计
 - 完成重庆部分高校Minecraft服务器的收集
+<<<<<<< HEAD
 
 ## MUA联盟数组含义
 
@@ -105,6 +106,9 @@ Alliance，是重庆市高校的Minecraft联盟。CQMUA的本质是借助Minecra
     - [x] No further requests after flip animation cycle completes
 
 
+=======
+- 
+>>>>>>> 7b43633 (docs:文档更新)