fix(detailsTooltip): rebase issues

CrisisCleanup · Nov 11, 2024 · 3ffa617 · 3ffa617
1 parent 81baf02
commit 3ffa617
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/components/user/DetailsTooltip.vue b/src/components/user/DetailsTooltip.vue
@@ -62,12 +62,9 @@
 <script lang="ts">
 import { computed, onMounted, ref } from 'vue';
 import User from '../../models/User';
-<<<<<<< HEAD
 import { DbService, USER_DATABASE } from '@/services/db.service';
-=======
 import { getUserAvatarLink } from '../../utils/urls';
 import Avatar from '@/components/Avatar.vue';
->>>>>>> feat(detailsTooltip): add image to the side
 
 export default defineComponent({
   name: 'UserDetailsTooltip',