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/customAccountUrlComp/customAccountUrlComp.html | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.html b/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.html index e8fd634..c38ec0a 100644 --- a/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.html +++ b/force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.html @@ -1,6 +1,5 @@ <template> <template if:false={isDisable}> -<<<<<<< HEAD <lightning-formatted-url value={accountUrl} label={accountName} @@ -9,11 +8,3 @@ </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> ->>>>>>> LEXCommunityLiJun -- Gitblit v1.9.1