Skip to content

Commit

Permalink
Updates the config merging options.
Browse files Browse the repository at this point in the history
  • Loading branch information
mihai-vlc committed Sep 4, 2015
1 parent eff559b commit a124631
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions jsfmt.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ stdin(function(data) {
var scope = process.argv[3];
var conf = jsfmt.getConfig();

var optsJSON = extend(true, {}, conf, JSON.parse(process.argv[4]));
var optsJSON = extend({}, conf, JSON.parse(process.argv[4]));
var opts = conf;
var js;

// if we don't have a jsfmtrc file
// use the settings from .sublime-settings
if( ! opts.config) {
opts = extend(true, {}, opts, JSON.parse(process.argv[2]));
opts = extend({}, opts, JSON.parse(process.argv[2]));
}

try {
Expand Down

0 comments on commit a124631

Please sign in to comment.