fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 force-app/main/default/lwc/customAccountUrlComp/customAccountUrlComp.html

@@ -1,10 +1,19 @@
<template>
  <template if:false={isDisable}>
    <lightning-formatted-url
      value={accountUrl}
      label={accountName}
      target="_blank"
    ></lightning-formatted-url>
  </template>
  <template if:true={isDisable}> {accountName} </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>
>>>>>>> LEXCommunityLiJun