From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/aura/CreateTarget/CreateTarget.css | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.css b/force-app/main/default/aura/CreateTarget/CreateTarget.css
index f79adff..52e32ca 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.css
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.css
@@ -1,12 +1,20 @@
.THIS.button_area {
- text-align: right;
+ text-align: right;
}
.THIS.disp_none {
- display: none;
+ display: none;
}
.THIS select {
- --lwc-lineHeightButton: 36px;
- --lwc-heightInput: 36px;
- min-height: 0px !important;
- height: 36px !important;
+<<<<<<< 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