-
# Conflicts: # monitor-ui-ctrl/src/main/java/com/ui/ctrl/ProjectBuildCtrl.java
-
# Conflicts: # monitor-ui-common/src/main/java/com/ui/contants/HttpUriContants.java
-
# Conflicts: # monitor-ui-web/src/main/webapp/script/common/genarate_left_panel.js
-
# Conflicts: # monitor-ui-web/src/main/webapp/script/common/genarate_left_panel.js