From 34fe52caba63e6a6337cb9c3e6bd0d4707fd6a99 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:17:05 +0800
Subject: [PATCH] 解决冲突
---
admin/public/index.html | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/admin/public/index.html b/admin/public/index.html
index f8a9b72..8ed5c0a 100644
--- a/admin/public/index.html
+++ b/admin/public/index.html
@@ -5,21 +5,12 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
-<<<<<<< HEAD
<title>鏅烘収鍥尯瀹夋秷涓�浣撳寲绯荤粺</title>
</head>
<body>
- <noscript>
- <strong>We're sorry but 鏅烘収鍥尯瀹夋秷涓�浣撳寲绯荤粺 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-=======
- <title>鑺滄箹鐑熻崏鏅烘収瀹夋秷瀹夊叏闃茶寖绯荤粺</title>
- </head>
- <body>
- <noscript>
- <strong>We're sorry but 鑺滄箹鐑熻崏鏅烘収瀹夋秷瀹夊叏闃茶寖绯荤粺 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
->>>>>>> c5675caa (鏈�鏂扮増鏈�541200007)
- </noscript>
+<noscript>
+ <strong>We're sorry but 鏅烘収鍥尯瀹夋秷涓�浣撳寲绯荤粺 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+</noscript>
<div id="app"></div>
- <!-- built files will be auto injected -->
</body>
</html>
--
Gitblit v1.9.3