modify selftmreg

1b5ef243 · 尹亚亭 · a2746794 · 1b5ef243
Commit 1b5ef243 authored Jan 04, 2020 by 尹亚亭
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

channel-access/src/assets/css/globelcolor.scss
+0 -5

No files found.
--- a/channel-access/src/assets/css/globelcolor.scss
+++ b/channel-access/src/assets/css/globelcolor.scss
@@ -6,10 +6,6 @@ $--color-primary: #108ee9;

 $--font-path: '~element-ui/lib/theme-chalk/fonts';
 // 自定义主题色变量
-<<<<<<< HEAD
-$themecolor:#409EFF;
-=======
 // $themecolor:red;
 $themecolor:#108ee9;
->>>>>>> 4a8f704facc4d880c9ba3368cdcc80b63a8eb736
 @import "~element-ui/packages/theme-chalk/src/index";
\ No newline at end of file