fix: resolve conflicts

This commit is contained in:
三咲智子 2023-01-04 22:15:24 +08:00
parent 66295199b4
commit 53dcd8b28f
No known key found for this signature in database
GPG key ID: 69992F2250DFD93E

View file

@ -3,7 +3,7 @@
<button btn-action-icon :aria-label="$t('action.switch_account')">
<!-- TODO -->
<div :class="{ 'hidden xl:block': !isGuest }" i-ri:more-2-line />
<AccountAvatar v-if="!isGuest" xl:hidden :account="account" w-9 h-9 />
<AccountAvatar v-if="!isGuest" xl:hidden :account="currentUser.account" w-9 h-9 />
<span v-else>TODO: Guest</span>
</button>
<template #popper="{ hide }">