config/Settings.ts: Remove duplicate DialogflowRequestFailedMessage

Author: Kailash0311

config/Settings.ts

@@ -27,7 +27,6 @@ export enum DefaultMessage {
     DEFAULT_DialogflowHandoverFailedMessage = 'Sorry I\'m unable to transfer you to an agent.',
     DEFAULT_DialogflowCloseChatMessage = 'Closing the chat, Goodbye',
     DEFAULT_DialogflowWelcomeMessage = 'Thanks for connecting',
-    DEFAULT_DialogflowRequestFailedMessage = 'Apologies but your request cannot be completed.',
 }
 
 export const settings: Array<ISetting> = [

handler/ExecuteLivechatBlockActionHandler.ts

@@ -7,11 +7,7 @@ import { IUser } from '@rocket.chat/apps-engine/definition/users';
 import { AppSetting, DefaultMessage } from '../config/Settings';
 import { ActionIds } from '../enum/ActionIds';
 import { createLivechatMessage, createMessage, deleteAllActionBlocks } from '../lib/Message';
-<<<<<<< HEAD
-import { closeChat, performHandover, updateRoomCustomFields } from '../lib/Room';
-=======
 import { closeChat, performHandover } from '../lib/Room';
->>>>>>> fixing handover button and adding optional param
 import { getAppSettingValue } from '../lib/Settings';
 
 export class ExecuteLivechatBlockActionHandler {