ops / monitor-ui · Commits

Go to a project

Authored by zhengyouwei
Commit 31eeeeb31008fe3cdee7d11b45ef938ef91a134a 2 parents 0394197a 9a3ce0ea

Merge branch 'master' of http://git.yoho.cn/ops/monitor-ui 

# Conflicts:
#	monitor-ui-web/src/main/webapp/index.jsp
Inline Side-by-side
Showing 1 changed file with 0 additions and 1 deletions
@@ -34,7 +34,6 @@ @@ -34,7 +34,6 @@
34 <link rel="stylesheet" href="<%=basePath %>css/unicorn.grey.css" class="skin-color"/> 34 <link rel="stylesheet" href="<%=basePath %>css/unicorn.grey.css" class="skin-color"/>
35 <link rel="stylesheet" href="<%=basePath %>css/jquery-ui.css"/> 35 <link rel="stylesheet" href="<%=basePath %>css/jquery-ui.css"/>
36 <link rel="stylesheet" href="<%=basePath %>css/uniform.css"/> 36 <link rel="stylesheet" href="<%=basePath %>css/uniform.css"/>
37 - <link rel="stylesheet" href="<%=basePath %>css/select2.css"/>  
38 <link rel="stylesheet" href="<%=basePath %>js/jstree/themes/proton/style.css"/> 37 <link rel="stylesheet" href="<%=basePath %>js/jstree/themes/proton/style.css"/>
39 <link rel="stylesheet" href="<%=basePath %>css/select2.css"/> 38 <link rel="stylesheet" href="<%=basePath %>css/select2.css"/>
40 <link rel="stylesheet" href="<%=basePath %>css/yoho.css"/> 39 <link rel="stylesheet" href="<%=basePath %>css/yoho.css"/>