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 | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/lwc/customDeleteReasonComp/customDeleteReasonComp.html b/force-app/main/default/lwc/customDeleteReasonComp/customDeleteReasonComp.html
index b0e319f..e6e1c1d 100644
--- a/force-app/main/default/lwc/customDeleteReasonComp/customDeleteReasonComp.html
+++ b/force-app/main/default/lwc/customDeleteReasonComp/customDeleteReasonComp.html
@@ -1,3 +1,12 @@
<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>
\ No newline at end of file
+</template>
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1