From cd411e7b3ade23951e8935924252f7059cc096d5 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 03 Jun 2021 11:23:05 +0800
Subject: [PATCH] 合并冲突
---
widgets/Tool/css/style.css | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/widgets/Tool/css/style.css b/widgets/Tool/css/style.css
index be6c81a..14c794a 100644
--- a/widgets/Tool/css/style.css
+++ b/widgets/Tool/css/style.css
@@ -62,7 +62,6 @@
.jimu-widget-Tool .tool-bar .tool-y-box li {
list-style : none;
- margin : 0px 4px;
height : 34px;
line-height: 34px;
width : 102px;
--
Gitblit v1.9.3