From 30c25a7b4929592222cad2fe08870ff85d970fcb Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Wed, 24 Jul 2019 18:41:14 -0400
Subject: [PATCH] revert

---
 packages/embark-core/src/processes/processLauncher.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/embark-core/src/processes/processLauncher.js b/packages/embark-core/src/processes/processLauncher.js
index e57b13c47..e47261198 100644
--- a/packages/embark-core/src/processes/processLauncher.js
+++ b/packages/embark-core/src/processes/processLauncher.js
@@ -1,4 +1,5 @@
 const child_process = require('child_process');
+<<<<<<< HEAD
 const EventEmitter = require('events');
 
 class ProcessLauncher extends EventEmitter {
@@ -118,12 +119,14 @@ class ProcessLauncher extends EventEmitter {
 
 
 
+=======
+>>>>>>> parent of 2beeaa68... process launching code
 const constants = require('../../constants');
 const path = require('path');
 const ProcessLogsApi = require('embark-process-logs-api');
 
 let processCount = 1;
-export class ProcessLauncherOld {
+export class ProcessLauncher {
 
   /**
    * Constructor of ProcessLauncher. Forks the module and sets up the message handling