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-05-19 16:20:33 +05:30 committed by GitHub
parent cd796ef996
commit 8003abd58f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crm/locale/main.pot
View File

@ -4161,15 +4161,9 @@ msgstr ""
#: frontend/src/components/ColumnSettings.vue:134 #: frontend/src/components/ColumnSettings.vue:134
#: frontend/src/components/Modals/AssignmentModal.vue:17 #: frontend/src/components/Modals/AssignmentModal.vue:17
#: frontend/src/components/Modals/EmailTemplateModal.vue:9 #: frontend/src/components/Modals/EmailTemplateModal.vue:9
<<<<<<< HEAD
#: frontend/src/components/Modals/NoteModal.vue:8
#: frontend/src/components/Modals/TaskModal.vue:8
#: frontend/src/components/Settings/GeneralSettings.vue:112
=======
#: frontend/src/components/Modals/NoteModal.vue:6 #: frontend/src/components/Modals/NoteModal.vue:6
#: frontend/src/components/Modals/TaskModal.vue:6 #: frontend/src/components/Modals/TaskModal.vue:6
#: frontend/src/components/Settings/GeneralSettings.vue:113 #: frontend/src/components/Settings/GeneralSettings.vue:113
>>>>>>> 0cc69d9 (chore: update POT file)
#: frontend/src/components/Settings/ProfileSettings.vue:71 #: frontend/src/components/Settings/ProfileSettings.vue:71
#: frontend/src/components/Settings/SettingsPage.vue:31 #: frontend/src/components/Settings/SettingsPage.vue:31
#: frontend/src/components/Settings/TelephonySettings.vue:70 #: frontend/src/components/Settings/TelephonySettings.vue:70