From 73b39d58fb970ef006bc465310b41c09b3337665 Mon Sep 17 00:00:00 2001 From: Pratik Date: Tue, 22 Apr 2025 15:55:06 +0530 Subject: [PATCH] fix: merge conflict --- .../components/Settings/{emailConfig.ts => emailConfig.js} | 5 ----- 1 file changed, 5 deletions(-) rename frontend/src/components/Settings/{emailConfig.ts => emailConfig.js} (94%) diff --git a/frontend/src/components/Settings/emailConfig.ts b/frontend/src/components/Settings/emailConfig.js similarity index 94% rename from frontend/src/components/Settings/emailConfig.ts rename to frontend/src/components/Settings/emailConfig.js index 1aec4175..1b2c7184 100644 --- a/frontend/src/components/Settings/emailConfig.ts +++ b/frontend/src/components/Settings/emailConfig.js @@ -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'),