From 37df5d62541752d4cfbcc599f56dc7053bc23faa Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Sun, 8 Jun 2025 12:37:15 +0530 Subject: [PATCH] fix: yet another unused import due to merge conflict (cherry picked from commit ab409dfd2c01d63952ed863496dc69ea1968e246) # Conflicts: # frontend/src/pages/MobileContact.vue --- frontend/src/pages/MobileContact.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/pages/MobileContact.vue b/frontend/src/pages/MobileContact.vue index ea601ca5..66989de1 100644 --- a/frontend/src/pages/MobileContact.vue +++ b/frontend/src/pages/MobileContact.vue @@ -168,9 +168,12 @@ import CameraIcon from '@/components/Icons/CameraIcon.vue' import DealsIcon from '@/components/Icons/DealsIcon.vue' import DealsListView from '@/components/ListViews/DealsListView.vue' <<<<<<< HEAD +<<<<<<< HEAD import { formatDate, timeAgo } from '@/utils' ======= import AddressModal from '@/components/Modals/AddressModal.vue' +======= +>>>>>>> ab409dfd (fix: yet another unused import due to merge conflict) import { formatDate, timeAgo, validateIsImageFile } from '@/utils' >>>>>>> c6ad1085 (refactor: DRY up validate image file) import { getView } from '@/utils/view'