From e8e4367eb7857c9b5fa590f599ce4711338eb0ed Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Fri, 5 Sep 2025 15:50:09 +0530
Subject: [PATCH] chore: resolved conflict

---
 frontend/src/components/SidePanelLayout.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/src/components/SidePanelLayout.vue b/frontend/src/components/SidePanelLayout.vue
index 2b2ca5af..45a05f8f 100644
--- a/frontend/src/components/SidePanelLayout.vue
+++ b/frontend/src/components/SidePanelLayout.vue
@@ -322,11 +322,7 @@ import { usersStore } from '@/stores/users'
 import { isMobileView } from '@/composables/settings'
 import { getFormat, evaluateDependsOnValue } from '@/utils'
 import { flt } from '@/utils/numberFormat.js'
-<<<<<<< HEAD
-import { Tooltip, DateTimePicker, DatePicker, Popover } from 'frappe-ui'
-=======
-import { Tooltip, DateTimePicker, DatePicker, TimePicker } from 'frappe-ui'
->>>>>>> 50708ebe (fix: if contact email is updated it is updating previously opened contact)
+import { Tooltip, DateTimePicker, DatePicker } from 'frappe-ui'
 import { useDocument } from '@/data/document'
 import { ref, computed, getCurrentInstance } from 'vue'