From df5aa8087c2c7328dc4188f05d762c8df1f0b07a Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 18 七月 2023 09:19:12 +0800
Subject: [PATCH] changeorg

---
 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