build

src/components/PageContent/src/actions/action-un-tag.tsx

@@ -107,17 +107,6 @@ const ActionUnTag = defineComponent({
         onConfirm={onAddTagWithCode}
         v-slots={{
           reference: () => (
-<<<<<<< HEAD
-            <ElButton
-              link
-              class="reset-margin"
-              type="default"
-              onClick={() => (visible.value = true)}
-              icon={useRenderIcon(
-                coinIconTypes.includes(props.tagProps.type) ? "coin" : "stamp"
-              )}
-            />
-=======
             <ElTooltip placement="top" content={`解除${title.value}标签`}>
               <ElButton
                 link
@@ -129,7 +118,6 @@ const ActionUnTag = defineComponent({
                 )}
               />
             </ElTooltip>
->>>>>>> v3.0
           )
         }}
       />