From 3e89729331e0f0cbb1b1aa7fea60cbd92d4f7c43 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Fri, 31 Aug 2018 08:46:08 -0400
Subject: [PATCH] conflict with indents

---
 lib/core/modules/coderunner/codeRunner.js      | 4 ++--
 test_apps/test_app/test/simple_storage_spec.js | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/core/modules/coderunner/codeRunner.js b/lib/core/modules/coderunner/codeRunner.js
index 3fccdfd2..61fbbd89 100644
--- a/lib/core/modules/coderunner/codeRunner.js
+++ b/lib/core/modules/coderunner/codeRunner.js
@@ -80,8 +80,8 @@ class CodeRunner {
       this.ipc.broadcast("runcode:newCommand", {code});
     }
 
-    if (result instanceof Promise) {
-      return result.then((value) => cb(null, value)).catch(cb);
+    if (result instanceof Promise && !result.on) {
+      return result.then((value) => { cb(null, value); }).catch(cb);
     }
 
     cb(null, result);
diff --git a/test_apps/test_app/test/simple_storage_spec.js b/test_apps/test_app/test/simple_storage_spec.js
index 5596da69..eb5c4662 100644
--- a/test_apps/test_app/test/simple_storage_spec.js
+++ b/test_apps/test_app/test/simple_storage_spec.js
@@ -23,7 +23,6 @@ contract("SimpleStorage", function () {
   });
 
   it("set storage value", function (done) {
-    // await SimpleStorage.methods.set(150).send();
     Utils.secureSend(web3, SimpleStorage.methods.set(150), {}, false, async function(err) {
       if (err) {
         return done(err);