Skip to content

Commit

Permalink
Merge branch 'master' of github.com:1602/express-on-railway
Browse files Browse the repository at this point in the history
  • Loading branch information
1602 committed Jul 2, 2012
2 parents 0abe74c + e88323d commit d66cf40
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/generators.js
Expand Up @@ -689,10 +689,10 @@ exports.list = function () {
catch(e) {} catch(e) {}
}); });
if (config != null) return config; if (config != null) return config;
throw new Error( sys.format('Can not find configuration file by path template"%s"', filename) ); throw new Error( sys.format('Can not find configuration file by path template "%s"', filename) );
break; break;
case 'json': case 'json':
return JSON.parse(require('fs').readFileSync(filename, 'utf8')); return JSON.parse(fs.readFileSync(filename, 'utf8'));
case 'yml': case 'yml':
return require(filename).shift(); return require(filename).shift();
default: default:
Expand Down

0 comments on commit d66cf40

Please sign in to comment.