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/customMydrComp/customMydrComp.html | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/lwc/customMydrComp/customMydrComp.html b/force-app/main/default/lwc/customMydrComp/customMydrComp.html
index 778abb0..e57cc8b 100644
--- a/force-app/main/default/lwc/customMydrComp/customMydrComp.html
+++ b/force-app/main/default/lwc/customMydrComp/customMydrComp.html
@@ -1,5 +1,4 @@
<template>
-<<<<<<< HEAD
<lightning-input
type="checkbox"
label="浠匨yDr"
@@ -9,8 +8,3 @@
data-field="MyDr"
></lightning-input>
</template>
-=======
- <lightning-input type="checkbox" label="浠匨yDr" checked={isCheckedMyDr} onchange={dataChange} variant="label-hidden"
- data-field="MyDr"></lightning-input>
-</template>
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1