diff options
| author |  vantezzen <hello@vantezzen.io> | 2019-10-09 10:04:18 +0200 |
|---|---|---|
| committer | vantezzen <hello@vantezzen.io> | 2019-10-09 10:04:18 +0200 |
| commit | 6898419473197f4ac76facc18b2b33fcd0b90c44 (patch) | |
| tree | 0297406851ab942c9d15869023951072998c14fb /src/components/services/content/ServiceView.js | |
| parent | Merge branch 'master' of https://github.com/meetfranz/franz into franz-5.4.0 (diff) | |
| download | ferdium-app-6898419473197f4ac76facc18b2b33fcd0b90c44.tar.gz ferdium-app-6898419473197f4ac76facc18b2b33fcd0b90c44.tar.zst ferdium-app-6898419473197f4ac76facc18b2b33fcd0b90c44.zip | |
Fix merge errors
Diffstat (limited to 'src/components/services/content/ServiceView.js')
| -rw-r--r-- | src/components/services/content/ServiceView.js | 3 |
1 files changed, 0 insertions, 3 deletions
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 { | |||
| 180 | </Fragment> | 180 | </Fragment> |
| 181 | ) : ( | 181 | ) : ( |
| 182 | <> | 182 | <> |
| 183 | {service.recipe.id === 'franz-custom-website' && ( | ||
| 184 | <WebControlsScreen service={service} /> | ||
| 185 | )} | ||
| 186 | {!this.state.hibernate ? ( | 183 | {!this.state.hibernate ? ( |
| 187 | <> | 184 | <> |
| 188 | {service.recipe.id === CUSTOM_WEBSITE_ID && ( | 185 | {service.recipe.id === CUSTOM_WEBSITE_ID && ( |