From cd411e7b3ade23951e8935924252f7059cc096d5 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 03 Jun 2021 11:23:05 +0800
Subject: [PATCH] 合并冲突
---
config.json | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/config.json b/config.json
index 78cd021..18f2d16 100644
--- a/config.json
+++ b/config.json
@@ -32,20 +32,10 @@
{
"uri": "widgets/Tool/Widget",
"position": {
- "right": 154,
- "top": 20,
- "height": "32px",
- "width": "96px",
- "relativeTo": "map"
- }
- },
- {
- "uri": "widgets/Layermanagement/Widget",
- "position": {
"right": 82,
"top": 20,
"height": "32px",
- "width": "72px",
+ "width": "96px",
"relativeTo": "map"
}
},
--
Gitblit v1.9.3