From d6437d31d4e99291d25b84584920db3431fb26c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samy=20Pess=C3=A9?= <samypesse@gmail.com>
Date: Tue, 25 Nov 2014 18:53:00 +0100
Subject: [PATCH] Omit "generator" when building file with config file

---
 lib/generate/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/generate/index.js b/lib/generate/index.js
index 8cd263d3f..01c8b6220 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