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-18 15:38:44 +05:30 committed by GitHub
parent ee4b7721b0
commit 7dd98733f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/components/Settings/Users.vue
View File

@ -169,10 +169,6 @@
import AddExistingUserModal from '@/components/Modals/AddExistingUserModal.vue' import AddExistingUserModal from '@/components/Modals/AddExistingUserModal.vue'
import { activeSettingsPage } from '@/composables/settings' import { activeSettingsPage } from '@/composables/settings'
import { usersStore } from '@/stores/users' import { usersStore } from '@/stores/users'
<<<<<<< HEAD
import { TemplateOption, DropdownOption } from '@/utils'
import { Avatar, TextInput, toast, call, FeatherIcon, Tooltip } from 'frappe-ui'
=======
import { DropdownOption } from '@/utils' import { DropdownOption } from '@/utils'
import { import {
Dropdown, Dropdown,
@ -183,7 +179,6 @@ import {
FeatherIcon, FeatherIcon,
Tooltip, Tooltip,
} from 'frappe-ui' } from 'frappe-ui'
>>>>>>> ac34ac9b (refactor: remove TemplateOption component usage and simplify dropdown options in multiple components)
import { ref, computed, onMounted } from 'vue' import { ref, computed, onMounted } from 'vue'
const { users, isAdmin, isManager } = usersStore() const { users, isAdmin, isManager } = usersStore()