From 987f4a8672eb87bc9a85d8dac8e0581dc3ed48a6 Mon Sep 17 00:00:00 2001 From: Grandschtroumpf Date: Sat, 2 Mar 2019 09:52:08 +0100 Subject: [PATCH] fix merge conflict --- src/app/files/fileManager.js | 4 ---- src/app/tabs/compile-tab.js | 5 ----- 2 files changed, 9 deletions(-) diff --git a/src/app/files/fileManager.js b/src/app/files/fileManager.js index 3ed7ab132d..e54a1a286d 100644 --- a/src/app/files/fileManager.js +++ b/src/app/files/fileManager.js @@ -40,10 +40,6 @@ class FileManager { self._deps.gistExplorer.event.register('fileRemoved', (path) => { this.fileRemovedEvent(path) }) self._deps.localhostExplorer.event.register('errored', (event) => { this.removeTabsOf(self._deps.localhostExplorer) }) self._deps.localhostExplorer.event.register('closed', (event) => { this.removeTabsOf(self._deps.localhostExplorer) }) -<<<<<<< HEAD -======= - ->>>>>>> User `events` and `EventEmitter` instead of `event` and `EventManager` } profile () { diff --git a/src/app/tabs/compile-tab.js b/src/app/tabs/compile-tab.js index faa680848e..6705be3444 100644 --- a/src/app/tabs/compile-tab.js +++ b/src/app/tabs/compile-tab.js @@ -338,14 +338,9 @@ class CompileTab { this._view.errorContainer = yo`
` this._view.contractSelection = this.contractSelection() -<<<<<<< HEAD this._view.compilerContainer = this.compilerContainer.render() const currentFile = this._deps.fileManager.currentFile() if (currentFile) this.compilerContainer.currentFile = currentFile -======= - this.compilerContainer.currentFile = this._deps.fileManager.currentFile() - this._view.compilerContainer = this.compilerContainer.render() ->>>>>>> User `events` and `EventEmitter` instead of `event` and `EventManager` this._view.el = yo`