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