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

fix: merge conflict

Browse Source
This commit is contained in:
Pratik 2025-04-22 15:55:06 +05:30
parent b28c6b94f1
commit 73b39d58fb
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'), label: __('Enable Incoming'),
name: 'enable_incoming', name: 'enable_incoming',
type: 'checkbox', type: 'checkbox',
<<<<<<< HEAD:frontend/src/components/Settings/emailConfig.ts
description:
'If enabled, tickets can be created from the incoming emails on this account.',
=======
description: __( description: __(
'If enabled, records can be created from the incoming emails on this account.', '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'), label: __('Enable Outgoing'),