From d6a23b3b6a7b8ba8a3f71a384b0fe9463fb36041 Mon Sep 17 00:00:00 2001
From: 157 <3619242020@qq.com>
Date: Wed, 20 Dec 2023 22:59:18 +0800
Subject: [PATCH] revert conflict

---
 game/game.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/game/game.js b/game/game.js
index 8406e78ac..bcc80ba4b 100644
--- a/game/game.js
+++ b/game/game.js
@@ -1757,7 +1757,6 @@ new Promise(resolve=>{
 					},
 					splash_style:{
 						name:'启动页',
-						init:'style1',
 						item:{
 							style1:'样式一',
 							style2:'样式二',