From f7a39b036eabaf63118b5d0650517ea9868c08d8 Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Mon, 17 Feb 2020 16:49:37 +0100
Subject: [PATCH] fixed some errors. Todo: Home is broken

---
 package-lock.json          | 13 +++++++++----
 src/app.js                 |  1 -
 src/app/panels/terminal.js |  3 ---
 src/remixAppManager.js     |  7 -------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7e0c19eff0..8401a852ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6737,7 +6737,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -7110,7 +7111,8 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -7158,6 +7160,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -7196,11 +7199,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
diff --git a/src/app.js b/src/app.js
index fffdd7aefc..45d0ac806b 100644
--- a/src/app.js
+++ b/src/app.js
@@ -247,7 +247,6 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
       self._view.el.style.visibility = 'visible'
     }, 1500)
   })
-  
   // ----------------- editor servive ----------------------------
   const editor = new Editor({}, themeModule) // wrapper around ace editor
   registry.put({api: editor, name: 'editor'})
diff --git a/src/app/panels/terminal.js b/src/app/panels/terminal.js
index 538e6bef60..624f0a268b 100644
--- a/src/app/panels/terminal.js
+++ b/src/app/panels/terminal.js
@@ -98,9 +98,6 @@ class Terminal extends Plugin {
     if (opts.shell) self._shell = opts.shell // ???
     register(self)
   }
-  setTxListener(txListener) {
-    this._opts.txListener = txListener
-  }
   logHtml (html) {
     var command = this.commands['html']
     if (typeof command === 'function') command(html)
diff --git a/src/remixAppManager.js b/src/remixAppManager.js
index 31160f84ec..ad45ef2c75 100644
--- a/src/remixAppManager.js
+++ b/src/remixAppManager.js
@@ -35,11 +35,7 @@ export class RemixAppManager extends PluginManager {
     return true
   }
 
-<<<<<<< HEAD
   onPluginActivated (plugin) {
-=======
-  onActivated (plugin) {
->>>>>>> ac82ba81... using new engine
     this.pluginLoader.set(plugin, this.actives)
     this.event.emit('activate', plugin)
   }
@@ -63,7 +59,6 @@ export class RemixAppManager extends PluginManager {
     this.event.emit('added', plugin.name)
   }
 
-<<<<<<< HEAD
   async ensureActivated (apiName) {
     await this.activatePlugin(apiName)
     this.event.emit('ensureActivated', apiName)
@@ -74,8 +69,6 @@ export class RemixAppManager extends PluginManager {
     this.event.emit('ensureDeactivated', apiName)
   }
 
-=======
->>>>>>> ac82ba81... using new engine
   deactivatePlugin (name) {
     if (requiredModules.includes(name)) return
     super.deactivatePlugin(name)