feat(frontend): sqlserver 工具箱 TencentBlueKing#3485

# Reviewed, transaction id: 12218
hLinx · Jul 16, 2024 · 6466f05 · 6466f05
1 parent ff94f54
commit 6466f05
Showing 1 changed file with 1 addition and 6 deletions.
diff --git 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
+