test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

chore: resolved conflict

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

4
frontend/src/components/Settings/Settings.vue
View File

@ -58,14 +58,10 @@ import InviteUserPage from '@/components/Settings/InviteUserPage.vue'
import ProfileSettings from '@/components/Settings/ProfileSettings.vue' import ProfileSettings from '@/components/Settings/ProfileSettings.vue'
import WhatsAppSettings from '@/components/Settings/WhatsAppSettings.vue' import WhatsAppSettings from '@/components/Settings/WhatsAppSettings.vue'
import ERPNextSettings from '@/components/Settings/ERPNextSettings.vue' import ERPNextSettings from '@/components/Settings/ERPNextSettings.vue'
<<<<<<< HEAD
=======
import HelpdeskSettings from '@/components/Settings/HelpdeskSettings.vue'
import BrandSettings from '@/components/Settings/BrandSettings.vue' import BrandSettings from '@/components/Settings/BrandSettings.vue'
import HomeActions from '@/components/Settings/HomeActions.vue' import HomeActions from '@/components/Settings/HomeActions.vue'
import ForecastingSettings from '@/components/Settings/ForecastingSettings.vue' import ForecastingSettings from '@/components/Settings/ForecastingSettings.vue'
import CurrencySettings from '@/components/Settings/CurrencySettings.vue' import CurrencySettings from '@/components/Settings/CurrencySettings.vue'
>>>>>>> 03acea69 (refactor: enhance Settings component structure)
import EmailTemplatePage from '@/components/Settings/EmailTemplate/EmailTemplatePage.vue' import EmailTemplatePage from '@/components/Settings/EmailTemplate/EmailTemplatePage.vue'
import TelephonySettings from '@/components/Settings/TelephonySettings.vue' import TelephonySettings from '@/components/Settings/TelephonySettings.vue'
import EmailConfig from '@/components/Settings/EmailConfig.vue' import EmailConfig from '@/components/Settings/EmailConfig.vue'