embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-02-27 21:00:46 +00:00
Code Issues Projects Releases Wiki Activity

revert

Browse Source
This commit is contained in:
Iuri Matias 2019-07-24 18:41:14 -04:00
parent 1e3e17e78f
commit 30c25a7b49
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/embark-core/src/processes/processLauncher.js
View File

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