diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2017-11-10 16:16:51 +0100 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2017-11-10 16:16:51 +0100 |
| commit | cdb9d5686841d82c5dd0623f223de55dd0fc94d0 (patch) | |
| tree | b6a8fb58a59ef3387e555690d2e83817b95033c7 /src/components/services/content | |
| parent | Merge branch 'develop' into feature/mute-service (diff) | |
| download | ferdium-app-cdb9d5686841d82c5dd0623f223de55dd0fc94d0.tar.gz ferdium-app-cdb9d5686841d82c5dd0623f223de55dd0fc94d0.tar.zst ferdium-app-cdb9d5686841d82c5dd0623f223de55dd0fc94d0.zip | |
fix merging issues
Diffstat (limited to 'src/components/services/content')
| -rw-r--r-- | src/components/services/content/ServiceWebview.js | 3 |
1 files changed, 0 insertions, 3 deletions
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 { | |||
| 16 | service: PropTypes.instanceOf(ServiceModel).isRequired, | 16 | service: PropTypes.instanceOf(ServiceModel).isRequired, |
| 17 | setWebviewReference: PropTypes.func.isRequired, | 17 | setWebviewReference: PropTypes.func.isRequired, |
| 18 | reload: PropTypes.func.isRequired, | 18 | reload: PropTypes.func.isRequired, |
| 19 | <<<<<<< HEAD | ||
| 20 | isAppMuted: PropTypes.bool.isRequired, | 19 | isAppMuted: PropTypes.bool.isRequired, |
| 21 | ======= | ||
| 22 | enable: PropTypes.func.isRequired, | 20 | enable: PropTypes.func.isRequired, |
| 23 | >>>>>>> develop | ||
| 24 | }; | 21 | }; |
| 25 | 22 | ||
| 26 | static defaultProps = { | 23 | static defaultProps = { |