From 484bd662e2fd4461ef34dbf9d64106c12b3ef961 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 30 五月 2021 13:43:49 +0800
Subject: [PATCH] 冲突

---
 src/styles/theme-dark/variable.less |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/styles/theme-dark/variable.less b/src/styles/theme-dark/variable.less
index 430a7b4..dee09f6 100644
--- a/src/styles/theme-dark/variable.less
+++ b/src/styles/theme-dark/variable.less
@@ -1,4 +1,4 @@
-@import "../common/variable";
+//@import "../common/variable";
 
 /* 涓婚鑹�
 -------------------------- */

--
Gitblit v1.8.0