summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2014-11-25 18:53:00 +0100
committerSamy Pessé <samypesse@gmail.com>2014-11-25 18:53:02 +0100
commitd6437d31d4e99291d25b84584920db3431fb26c9 (patch)
tree7e4fec939f9efe74b2acf55afb8505484ef8c90c /lib
parent3dd33f1f3c0f8179fda55f47774cdd2431ed09c0 (diff)
downloadgitbook-d6437d31d4e99291d25b84584920db3431fb26c9.zip
gitbook-d6437d31d4e99291d25b84584920db3431fb26c9.tar.gz
gitbook-d6437d31d4e99291d25b84584920db3431fb26c9.tar.bz2
Omit "generator" when building file with config file
Diffstat (limited to 'lib')
-rw-r--r--lib/generate/index.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/generate/index.js b/lib/generate/index.js
index 8cd263d..01c8b62 100644
--- a/lib/generate/index.js
+++ b/lib/generate/index.js
@@ -64,7 +64,7 @@ var generate = function(options) {
try {
var _config = require(path.resolve(options.input, options.configFile));
- options = _.merge(options, _.omit(_config, 'input', 'configFile', 'defaultsPlugins'));
+ options = _.merge(options, _.omit(_config, 'input', 'configFile', 'defaultsPlugins', 'generator'));
}
catch(err) {
// No config file: not a big deal