From 3a0f8910c002baf14a1b77a2ddb49ceed21f13a2 Mon Sep 17 00:00:00 2001
From: zhaoxing <zhaoxing@shsening.com>
Date: 星期四, 20 十月 2022 09:21:40 +0800
Subject: [PATCH] 修正合并代码
---
js/index.js | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/js/index.js b/js/index.js
index ce22fcb..59789c3 100644
--- a/js/index.js
+++ b/js/index.js
@@ -103,12 +103,7 @@
//鍒涘缓涓夌淮鍦扮悆鍦烘櫙
map = new mars3d.Map("mars3dContainer", mapOptions);
-<<<<<<< HEAD
- //涓婃捣杈圭晫閬僵
-
-=======
->>>>>>> 6c1b125337b8a53e57151f36661ded58daf4d534
//鏋勯�爓idget
initWidget(map);
--
Gitblit v1.9.1