Fix merge

http-party · Jun 23, 2018 · ce11c70 · ce11c70
1 parent 6201b9b
commit ce11c70
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git 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
@@ -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,