From 636e651b6d537f6533b731947c7f7447a8ce12db Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 29 Jan 2021 14:47:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 public/map/controls/mapswitch/MapSwitchControl.html |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/map/views/map/controls/mapswitch/MapSwitchControl.html b/public/map/controls/mapswitch/MapSwitchControl.html
similarity index 100%
rename from public/map/views/map/controls/mapswitch/MapSwitchControl.html
rename to public/map/controls/mapswitch/MapSwitchControl.html

--
Gitblit v1.9.3