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/customDeleteReasonComp/customDeleteReasonComp.html |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/lwc/customDeleteReasonComp/customDeleteReasonComp.html b/force-app/main/default/lwc/customDeleteReasonComp/customDeleteReasonComp.html
index e6e1c1d..ab51f15 100644
--- a/force-app/main/default/lwc/customDeleteReasonComp/customDeleteReasonComp.html
+++ b/force-app/main/default/lwc/customDeleteReasonComp/customDeleteReasonComp.html
@@ -1,12 +1,7 @@
 <template>
-<<<<<<< HEAD
     <lightning-textarea
         name="input1"
         label="Enter some text"
         variant="label-hidden"
     ></lightning-textarea>
 </template>
-=======
-    <lightning-textarea name="input1" label="Enter some text"  variant="label-hidden"></lightning-textarea>
-</template>
->>>>>>> LEXCommunityLiJun

--
Gitblit v1.9.1