Merge pull request #150 from Anber/master

Extends shouldn't override local rules
matype · Jun 14, 2016 · 3bbab19 · 3bbab19
2 parents c2832fc + f967ba5
commit 3bbab19
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/params.js b/lib/params.js
@@ -77,7 +77,7 @@ function augmentParams (originParams, extention, configPath) {
     var params = {}
     params.indentWidth = getIndentationFromStylelintRules(rules)
     params.stylelint = rules
-    var newParams = objectAssign({}, originParams, params)
+    var newParams = objectAssign({}, params, originParams)
     return loadStylelintExtendConfig(newParams, config, dirname)
   })
 }