From 78514969fb6e0d9c024985e421e3a5f6ecc005fd Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Wed, 26 Aug 2020 11:26:19 -0300
Subject: [PATCH] [FIX] Wrong merge resolution after #2171 (#2431)

---
 app/views/SettingsView/index.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/views/SettingsView/index.js b/app/views/SettingsView/index.js
index faea2598..4d94bbe1 100644
--- a/app/views/SettingsView/index.js
+++ b/app/views/SettingsView/index.js
@@ -354,18 +354,6 @@ class SettingsView extends React.Component {
 
 					<SectionSeparator theme={theme} />
 
-					{this.showLivechat ? (
-						<>
-							<ListItem
-								title={I18n.t('Omnichannel')}
-								testID='settings-view-livechat'
-								right={() => this.renderLivechatSwitch()}
-								theme={theme}
-							/>
-							<SectionSeparator theme={theme} />
-						</>
-					) : null}
-
 					{!isFDroidBuild ? (
 						<>
 							<ListItem