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

chore: resolved conflict

Browse Source
This commit is contained in:
Shariq Ansari 2025-09-05 15:50:09 +05:30 committed by GitHub
parent afadf9f8f4
commit e8e4367eb7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/SidePanelLayout.vue
View File

@ -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'