From e1e2a85e12fcd662225cbc56a4da2df1838f4c88 Mon Sep 17 00:00:00 2001
From: hlinx <327159425@qq.com>
Date: Tue, 16 Jul 2024 14:43:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(frontend):=20sqlserver=20=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=AE=B1=20#3485?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbm-ui/frontend/lib/bk-icon/style.css | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/dbm-ui/frontend/lib/bk-icon/style.css b/dbm-ui/frontend/lib/bk-icon/style.css
index a222563c9c..dc1f8671be 100644
--- a/dbm-ui/frontend/lib/bk-icon/style.css
+++ b/dbm-ui/frontend/lib/bk-icon/style.css
@@ -635,15 +635,10 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
 .db-icon-daoru:before {
 	content: "\e1ef";
 }
-<<<<<<< HEAD
 .db-icon-piliangluru:before {
 	content: "\e1f1";
 }
 .db-icon-cluster-standardize:before {
 	content: "\e1f9";
 }
-<<<<<<< HEAD
-=======
-=======
->>>>>>> 3155ff4ed (feat(frontend): sqlserver 工具箱 #3485)
->>>>>>> local_sqlserver
+