From cdb9d5686841d82c5dd0623f223de55dd0fc94d0 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Fri, 10 Nov 2017 16:16:51 +0100
Subject: fix merging issues

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

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

diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 08ba5f33d..abbf21dee 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -16,11 +16,8 @@ export default class ServiceWebview extends Component {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     setWebviewReference: PropTypes.func.isRequired,
     reload: PropTypes.func.isRequired,
-<<<<<<< HEAD
     isAppMuted: PropTypes.bool.isRequired,
-=======
     enable: PropTypes.func.isRequired,
->>>>>>> develop
   };
 
   static defaultProps = {
-- 
cgit v1.2.3-70-g09d2