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

Merge pull request #778 from pratikb64/mergify/bp/main-hotfix/pr-776

Browse Source 
fix: merge conflict
This commit is contained in:
Pratik Badhe 2025-04-22 15:57:03 +05:30 committed by GitHub
commit cf352ddcc6
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/emailConfig.ts → frontend/src/components/Settings/emailConfig.js
View File

@ -28,14 +28,9 @@ export const incomingOutgoingFields = [
label: __('Enable Incoming'),
name: 'enable_incoming',
type: 'checkbox',
<<<<<<< HEAD:frontend/src/components/Settings/emailConfig.ts
description:
'If enabled, tickets can be created from the incoming emails on this account.',
=======
description: __(
'If enabled, records can be created from the incoming emails on this account.',
),
>>>>>>> 5eb46f6 (chore: add localization support for email account settings):frontend/src/components/Settings/emailConfig.js
},
{
label: __('Enable Outgoing'),