-
# Conflicts: # src/main/resources/static/pages/permission/authorize_all/user_auth.html # src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json # src/main/resources/static/real_control_v2/js/north/toolbar.js # src/main/resources/static/real_control_v2/js/utils/svg_chart.js # src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html # src/main/resources/static/real_control_v2/mapmonitor/js/map_overlay_manager.js
