From f44e12b0ff2dea52fcc20f9101461a6c946b083c Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Sun, 8 Jun 2025 12:36:39 +0530 Subject: [PATCH] fix: unused import due to merge conflict (cherry picked from commit 42285dd9110f74494314bd090f4df08794a1c8f0) # Conflicts: # frontend/src/pages/Contact.vue --- frontend/src/pages/Contact.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue index 1fed080d..f8b2fa54 100644 --- a/frontend/src/pages/Contact.vue +++ b/frontend/src/pages/Contact.vue @@ -185,10 +185,13 @@ 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 { showAddressModal, addressProps } from '@/composables/modals' ======= import AddressModal from '@/components/Modals/AddressModal.vue' +======= +>>>>>>> 42285dd9 (fix: unused import due to merge conflict) import { formatDate, timeAgo, validateIsImageFile } from '@/utils' >>>>>>> c6ad1085 (refactor: DRY up validate image file) import { getView } from '@/utils/view'