From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/aura/CreateTarget/CreateTarget.css | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.css b/force-app/main/default/aura/CreateTarget/CreateTarget.css
index 52e32ca..f17614f 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.css
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.css
@@ -5,16 +5,8 @@
display: none;
}
.THIS select {
-<<<<<<< HEAD
--lwc-lineHeightButton: 36px;
--lwc-heightInput: 36px;
min-height: 0px !important;
height: 36px !important;
}
-=======
- --lwc-lineHeightButton:36px;
- --lwc-heightInput:36px;
- min-height: 0px !important;
- height: 36px !important;
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1