From c5510dc9596e9b9b1a78523d5beb1e2403b60cd5 Mon Sep 17 00:00:00 2001
From: Zye <1838979562@qq.com>
Date: Sun, 7 Aug 2022 21:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86system.json=E5=92=8CMapInfos.josn?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80=E5=88=B0=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Readme.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index fac4233..a7c8fc2 100644
--- a/Readme.md
+++ b/Readme.md
@@ -22,11 +22,9 @@
 
 
 ## 更新记录
-<<<<<<< HEAD
+- **2022/8/7**；**面具**；将system.json和MapInfos.josn回退到历史版本
 - **2022/8/7**；**不明枪兵**；增加尖叫技能动画
-=======
 - **2022/8/7**；**面具**；技能细节优化，角色补充等
->>>>>>> 42897c099356ca6470de33ebd24938c91b98e5f9
 - **2022/8/6**；**不明枪兵**；增加星港地图，调整碰撞，增加传送事件调整地图联系
 - **2022/8/6**；**不明枪兵**；增加纳萨托恩特效
 - **2022/8/5**；**不明枪兵**；增加梦位面宇宙背景图