Comparing version 0.1.2 to 0.1.3
@@ -60,3 +60,3 @@ 'use strict'; | ||
var load = function (name, defaults) { | ||
defaults || (defaults = {}); | ||
defaults = merge({}, defaults || {}); | ||
@@ -73,8 +73,6 @@ return Promise.each(entries, function (entry) { | ||
}).then(function (value) { | ||
defaults = merge(value, defaults); | ||
merge(defaults, value); | ||
}); | ||
}); | ||
}).then(function () { | ||
return defaults; | ||
}); | ||
}).return(defaults); | ||
}; | ||
@@ -81,0 +79,0 @@ |
{ | ||
"name": "app-conf", | ||
"version": "0.1.2", | ||
"version": "0.1.3", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "keywords": [], |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
6957
202