test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

fix: unused import due to merge conflict

Browse Source 
(cherry picked from commit 42285dd9110f74494314bd090f4df08794a1c8f0)

# Conflicts:
#	frontend/src/pages/Contact.vue
This commit is contained in:
Hussain Nagaria 2025-06-08 12:36:39 +05:30 committed by Mergify
parent 6224c3eadc
commit f44e12b0ff
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/pages/Contact.vue
View File

@ -185,10 +185,13 @@ import CameraIcon from '@/components/Icons/CameraIcon.vue'
import DealsIcon from '@/components/Icons/DealsIcon.vue' import DealsIcon from '@/components/Icons/DealsIcon.vue'
import DealsListView from '@/components/ListViews/DealsListView.vue' import DealsListView from '@/components/ListViews/DealsListView.vue'
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
import { formatDate, timeAgo } from '@/utils' import { formatDate, timeAgo } from '@/utils'
import { showAddressModal, addressProps } from '@/composables/modals' import { showAddressModal, addressProps } from '@/composables/modals'
======= =======
import AddressModal from '@/components/Modals/AddressModal.vue' import AddressModal from '@/components/Modals/AddressModal.vue'
=======
>>>>>>> 42285dd9 (fix: unused import due to merge conflict)
import { formatDate, timeAgo, validateIsImageFile } from '@/utils' import { formatDate, timeAgo, validateIsImageFile } from '@/utils'
>>>>>>> c6ad1085 (refactor: DRY up validate image file) >>>>>>> c6ad1085 (refactor: DRY up validate image file)
import { getView } from '@/utils/view' import { getView } from '@/utils/view'