From 6898419473197f4ac76facc18b2b33fcd0b90c44 Mon Sep 17 00:00:00 2001
From: vantezzen <hello@vantezzen.io>
Date: Wed, 9 Oct 2019 10:04:18 +0200
Subject: Fix merge errors

---
 src/components/services/content/ServiceView.js | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/components/services/content/ServiceView.js')

diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 273653ea2..e5f095952 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -180,9 +180,6 @@ export default @observer @inject('stores') class ServiceView extends Component {
           </Fragment>
         ) : (
           <>
-            {service.recipe.id === 'franz-custom-website' && (
-              <WebControlsScreen service={service} />
-            )}
             {!this.state.hibernate ? (
               <>
                 {service.recipe.id === CUSTOM_WEBSITE_ID && (
-- 
cgit v1.2.3-54-g00ecf