test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolved conflict

Browse Source 
(cherry picked from commit efd03141f0121eed09958741d95d5b457010e03f)

# Conflicts:
#	frontend/components.d.ts
This commit is contained in:
Shariq Ansari 2025-06-17 23:42:20 +05:30 committed by Mergify
parent 1f1ee74b74
commit cc8868d892
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/components.d.ts vendored
View File

@ -156,6 +156,7 @@ declare module 'vue' {
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
LucideInfo: typeof import('~icons/lucide/info')['default'] LucideInfo: typeof import('~icons/lucide/info')['default']
>>>>>>> fad7c598 (refactor: profile page) >>>>>>> fad7c598 (refactor: profile page)
@ -163,6 +164,9 @@ declare module 'vue' {
======= =======
>>>>>>> dd122930 (fix: updated components.d.ts) >>>>>>> dd122930 (fix: updated components.d.ts)
======= =======
=======
LucideCalendar: typeof import('~icons/lucide/calendar')['default']
>>>>>>> efd03141 (chore: resolved conflict)
LucideInfo: typeof import('~icons/lucide/info')['default'] LucideInfo: typeof import('~icons/lucide/info')['default']
LucidePlus: typeof import('~icons/lucide/plus')['default'] LucidePlus: typeof import('~icons/lucide/plus')['default']
LucideSearch: typeof import('~icons/lucide/search')['default'] LucideSearch: typeof import('~icons/lucide/search')['default']