From f8f49f95605ac68748cf438d150fad02e7598e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Tue, 30 Dec 2025 08:59:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yanzhu-bigscreen/public/index.html | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/yanzhu-bigscreen/public/index.html b/yanzhu-bigscreen/public/index.html
index 4c8889d0..4d4a691b 100644
--- a/yanzhu-bigscreen/public/index.html
+++ b/yanzhu-bigscreen/public/index.html
@@ -13,17 +13,10 @@
     <link rel="stylesheet" href="css/new.css?v=2024052901" />
 
     <link rel="stylesheet" href="css/sichuanTibet.css?v=2024103201" />
-
-<<<<<<< HEAD
     <script
       type="text/javascript"
       src="https://api.map.baidu.com/api?type=webgl&v=1.0&ak=nDcjhjtaNwnVrKNIDbjibTm6i4u0k0fk"
     ></script>
-=======
-  <script
-    type="text/javascript"
-    src="https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=nDcjhjtaNwnVrKNIDbjibTm6i4u0k0fk"></script>
->>>>>>> 2f324e08658671aca3fac0cfad1a31289cbd8dc3
     <script src="/cdn/vue/dist/vue.js"></script>
     <script src="/cdn/element-ui/lib/index.js"></script>
     <script src="/cdn/jquery/3.5.1/jquery.min.js"></script>