From b50c2e6d00dce2fc198ec7bc67a48ff806af307b Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Wed, 2 Jul 2025 16:35:51 +0530 Subject: [PATCH] chore: resolved conflict --- frontend/components.d.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/components.d.ts b/frontend/components.d.ts index 84f74933..63df320c 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -162,11 +162,7 @@ declare module 'vue' { ListIcon: typeof import('./src/components/Icons/ListIcon.vue')['default'] ListRows: typeof import('./src/components/ListViews/ListRows.vue')['default'] LoadingIndicator: typeof import('./src/components/Icons/LoadingIndicator.vue')['default'] -<<<<<<< HEAD - LucideCalendar: typeof import('~icons/lucide/calendar')['default'] -======= LostReasonModal: typeof import('./src/components/Modals/LostReasonModal.vue')['default'] ->>>>>>> d89c304b (fix: show lost reason modal if status changed to lost) LucideInfo: typeof import('~icons/lucide/info')['default'] LucideMoreHorizontal: typeof import('~icons/lucide/more-horizontal')['default'] LucidePlus: typeof import('~icons/lucide/plus')['default']