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

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