From ce11c70b8837199b043e3dc1d94e886351a12e24 Mon Sep 17 00:00:00 2001
From: Ivan <ivan.montiel@nextiva.com>
Date: Sat, 23 Jun 2018 14:23:13 +0300
Subject: [PATCH] Fix merge

---
 bin/http-server    | 1 -
 lib/http-server.js | 1 -
 2 files changed, 2 deletions(-)

diff --git a/bin/http-server b/bin/http-server
index 650debe4..e71d588b 100755
--- a/bin/http-server
+++ b/bin/http-server
@@ -18,7 +18,6 @@ if (argv.h || argv.help) {
     'usage: http-server [path] [options]',
     '',
     'options:',
-    '  -b           Base path [/]',
     '  -p           Port to use [8080]',
     '  -a           Address to use [0.0.0.0]',
     '  -d           Show directory listings [true]',
diff --git a/lib/http-server.js b/lib/http-server.js
index ea448994..8d40fe17 100644
--- a/lib/http-server.js
+++ b/lib/http-server.js
@@ -97,7 +97,6 @@ function HttpServer(options) {
   before.push(ecstatic({
     baseDir: this.baseDir,
     root: this.root,
-    baseDir: options.baseDir,
     cache: this.cache,
     showDir: this.showDir,
     showDotfiles: this.showDotfiles,