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/customAccountUrlComp/customAccountUrlComp.html | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.html b/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.html
index 590c111..e8fd634 100644
--- a/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.html
+++ b/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.html
@@ -1,8 +1,19 @@
<template>
<template if:false={isDisable}>
+<<<<<<< HEAD
+ <lightning-formatted-url
+ value={accountUrl}
+ label={accountName}
+ target="_blank"
+ ></lightning-formatted-url>
+ </template>
+ <template if:true={isDisable}> {accountName} </template>
+</template>
+=======
<lightning-formatted-url value={accountUrl} label={accountName} target="_blank"></lightning-formatted-url>
</template>
<template if:true={isDisable}>
{accountName}
</template>
-</template>
\ No newline at end of file
+</template>
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1