From 2e1f8a1bee14bb06f39b0933e7ac460d3476c5ec Mon Sep 17 00:00:00 2001 From: Grandschtroumpf Date: Fri, 10 May 2019 11:22:10 +0200 Subject: [PATCH] fix merge conflict --- src/app.js | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/app.js b/src/app.js index e9cad6d3a2..885afb1930 100644 --- a/src/app.js +++ b/src/app.js @@ -334,16 +334,14 @@ Please make a backup of your contracts and start using http://remix.ethereum.org const themeModule = new ThemeModule(registry) registry.put({api: themeModule, name: 'themeModule'}) -<<<<<<< HEAD // ----------------- main view ---------------------- self._components.mainview = new MainView(appStore, appManager, mainPanelComponent) registry.put({ api: self._components.mainview, name: 'mainview' }) -======= + // ----------------- landing page ---------------------------- // Need to have Home initialized before VerticalIconComponent render to access profile of it for icon const landingPage = new LandingPage(appManager, appStore) ->>>>>>> fix browser issue // ----------------- Vertical Icon ---------------------------- const verticalIcons = new VerticalIcons('swapPanel', appStore, landingPage) registry.put({api: verticalIcons, name: 'verticalicon'}) @@ -372,21 +370,12 @@ Please make a backup of your contracts and start using http://remix.ethereum.org pluginManagerComponent.setApp(appManager) pluginManagerComponent.setStore(appStore) -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD self._components.mainview.init() -======= -======= + // Need to have Home initialized before VerticalIconComponent render to access profile of it for icon const landingPage = new LandingPage(appManager, appStore) ->>>>>>> Fix tests -======= ->>>>>>> fix browser issue - self._components.editorpanel.init() ->>>>>>> standard self._components.fileManager.init() self._view.mainpanel.appendChild(self._components.mainview.render()) self._view.iconpanel.appendChild(verticalIconsComponent.render())