From 0176aad25dc090300b3efc5d0d2e049434f5b4f1 Mon Sep 17 00:00:00 2001
From: Grandschtroumpf <francois.guezengar@hotmail.fr>
Date: Fri, 1 Mar 2019 22:18:44 +0100
Subject: [PATCH] User `events` and `EventEmitter` instead of `event` and
 `EventManager`

---
 src/app/files/fileManager.js | 4 ++++
 src/app/tabs/compile-tab.js  | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/app/files/fileManager.js b/src/app/files/fileManager.js
index e54a1a286d..3ed7ab132d 100644
--- a/src/app/files/fileManager.js
+++ b/src/app/files/fileManager.js
@@ -40,6 +40,10 @@ 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 6705be3444..faa680848e 100644
--- a/src/app/tabs/compile-tab.js
+++ b/src/app/tabs/compile-tab.js
@@ -338,9 +338,14 @@ class CompileTab {
 
     this._view.errorContainer = yo`<div></div>`
     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`
       <div id="compileTabView">