From cc8868d8925b4c9840f2e81b2a5d5b5ed8630870 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Tue, 17 Jun 2025 23:42:20 +0530
Subject: [PATCH] chore: resolved conflict

(cherry picked from commit efd03141f0121eed09958741d95d5b457010e03f)

# Conflicts:
#	frontend/components.d.ts
---
 frontend/components.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

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