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/lwc/lexSummonsCreat/lexSummonsCreat.css |   31 -------------------------------
 1 files changed, 0 insertions(+), 31 deletions(-)

diff --git a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css
index f39a0c1..c28189d 100644
--- a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css
+++ b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css
@@ -1,5 +1,4 @@
 @import 'c/lexCssUtility';
-<<<<<<< HEAD
 .outerBorderCss {
     border: 1px solid #d4d4d4;
     border-radius: 5px;
@@ -20,28 +19,6 @@
     text-align: center;
 }
 .centerCss .left {
-=======
-.outerBorderCss{
-    border: 1px solid #D4D4D4;
-    border-radius : 5px;
-    border-top : 3px solid #565959;
-}
-.borderCss{
-    border: 1px solid #D4D4D4;
-    border-radius : 5px;
-    margin-bottom : 7px;
-    border-top : 3px solid #565959;
-}
-.headerDorderCss{
-    border-top: 1px solid #565959;
-    border-bottom: 1px solid #D4D4D4;
-    padding:3px;
-}
-.centerCss{
-    text-align: center;
-}
-.centerCss .left{
->>>>>>> LEXCommunityLiJun
     margin-left: 100px;
 }
 .datatable {
@@ -58,17 +35,9 @@
 
 .fileUpload {
     font-size: 16px;
-<<<<<<< HEAD
     --lwc-formLabelFontSize: 16px;
-=======
-    --lwc-formLabelFontSize:16px;
->>>>>>> LEXCommunityLiJun
 }
 
 .disable-row-selection .slds-is-selected {
     outline: none !important;
-<<<<<<< HEAD
 }
-=======
-  }
->>>>>>> LEXCommunityLiJun

--
Gitblit v1.9.1