fix: make code compile again after rebase

lib/core/engine.js

@@ -73,7 +73,7 @@ class Engine {
       "libraryManager": this.libraryManagerService,
       "processManager": this.processManagerService,
       "storage": this.storageService,
-      "pluginCommand": this.pluginCommandService
+      "pluginCommand": this.pluginCommandService,
       "graph": this.graphService,
       "pluginCommand": this.pluginCommandService,
       "testRunner": this.testRunnerService,

lib/core/fs.js

@@ -204,7 +204,7 @@ module.exports = {
   writeFile,
   writeFileSync,
   writeJSONSync,
-  copyPreserve
+  copyPreserve,
   dappPath,
   pkgPath,
   outputFileSync,

lib/modules/ipfs/index.js

@@ -120,7 +120,7 @@ class IPFS {
       storageConfig: self.storageConfig,
       webServerConfig: self.webServerConfig,
       blockchainConfig: self.blockchainConfig,
-      corsParts: self.embark.config.corsParts
+      corsParts: self.embark.config.corsParts,
       embark: self.embark
     });
     self.logger.trace(`Storage module: Launching ipfs process...`);

lib/modules/swarm/index.js

@@ -98,7 +98,7 @@ class Swarm {
       events: self.events,
       storageConfig: self.storageConfig,
       webServerConfig: self.webServerConfig,
-      corsParts: self.embark.config.corsParts
+      corsParts: self.embark.config.corsParts,
       embark: self.embark
     });
     self.logger.trace(`Storage module: Launching swarm process...`);

package.json

@@ -100,14 +100,8 @@
     "pkg-up": "2.0.0",
     "promptly": "2.2.0",
     "propose": "0.0.5",
-<<<<<<< HEAD
     "remix-tests": "0.0.13",
-    "react-scripts": "^1.1.4",
-||||||| merged common ancestors
-    "react-scripts": "^1.1.4",
-=======
     "react-scripts": "1.1.5",
->>>>>>> exact versions per `npm ls --depth=0`
     "request": "2.88.0",
     "sass-loader": "7.1.0",
     "semver": "5.5.1",
@@ -125,22 +119,11 @@
     "url-loader": "1.1.1",
     "uuid": "3.3.2",
     "viz.js": "1.8.2",
-<<<<<<< HEAD
     "web3": "1.0.0-beta.34",
     "webpack": "4.19.0",
     "websocket": "1.0.28",
     "window-size": "1.1.1",
-    "webpack-bundle-analyzer": "^2.13.1",
-||||||| merged common ancestors
-    "web3": "1.0.0-beta.36",
-    "webpack": "4.18.0",
-    "webpack-bundle-analyzer": "^2.13.1",
-=======
-    "web3": "1.0.0-beta.36",
-    "webpack": "4.18.0",
-    "webpack-bundle-analyzer": "2.13.1",
->>>>>>> exact versions per `npm ls --depth=0`
-    "window-size": "1.1.1"
+    "webpack-bundle-analyzer": "^2.13.1"
   },
   "author": "Iuri Matias <iuri.matias@gmail.com>",
   "contributors": [],