From 266b74282f8fc6d5b0564f49a11561629cf7a645 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Tue, 31 Jul 2018 17:01:46 -0400
Subject: [PATCH] fix branch

---
 lib/modules/webserver/server.js | 3 ++-
 package.json                    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/modules/webserver/server.js b/lib/modules/webserver/server.js
index 950f533b..dea0edf1 100644
--- a/lib/modules/webserver/server.js
+++ b/lib/modules/webserver/server.js
@@ -7,6 +7,7 @@ var express = require('express');
 let path = require('path');
 var expressWebSocket = require('express-ws');
 var bodyParser = require('body-parser');
+var fs = require('../../core/fs.js');
 
 class Server {
   constructor(options) {
@@ -50,7 +51,7 @@ class Server {
       app.get('/*', function (req, res) {
         self.logger.trace('webserver> GET ' + req.path);
         res.sendFile(path.join(fs.dappPath(self.dist, 'index.html')));
-      }
+      });
     }
 
     app.listen(this.port);
diff --git a/package.json b/package.json
index 338da428..8dd61cc1 100644
--- a/package.json
+++ b/package.json
@@ -31,9 +31,9 @@
     "babel-loader": "8.0.0-beta.4",
     "babel-plugin-webpack-aliases": "^1.1.3",
     "bip39": "^2.5.0",
+    "body-parser": "^1.18.2",
     "chokidar": "^2.0.3",
     "clone-deep": "^4.0.0",
-    "body-parser": "^1.18.2",
     "colors": "^1.1.2",
     "commander": "^2.15.1",
     "css-loader": "^0.28.11",