From 4801ae5b97f6be8f5e414a41ee7c80ce5f9c9432 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 22 七月 2026 10:42:59 +0800
Subject: [PATCH] fix: 合并冲突
---
multiple/config.json | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/multiple/config.json b/multiple/config.json
index 936cb5c..4563751 100644
--- a/multiple/config.json
+++ b/multiple/config.json
@@ -341,7 +341,6 @@
"logo": "logo/QLMCLogo.png",
"favicon": "favicon/QLMCico.ico"
},
-<<<<<<< HEAD
"HYZC": {
"env": {
"VITE_APP_TITLE": "灞辫タ鍗庝嚎浼楁垚寤烘潗鏈夐檺鍏徃",
@@ -350,7 +349,7 @@
},
"logo": "logo/HYZCLogo.png",
"favicon": "favicon/HYZCfavicon.ico"
-=======
+ },
"OLD": {
"env": {
"VITE_APP_TITLE": "闈掓捣娆ц幈寰锋柊鏉愭枡绉戞妧鏈夐檺鍏徃",
@@ -359,7 +358,6 @@
},
"logo": "logo/OLDLogo.png",
"favicon": "favicon/OLD.ico"
->>>>>>> 2339ff7769b82ec68cc09ec70a9e61f70b0119dd
},
"logo": "/src/assets/logo/logo.png",
"favicon": "/public/favicon.ico"
--
Gitblit v1.9.3