Fix code style

2019-02-01 11:24:49 -05:00 · 2019-02-01 11:24:49 -05:00 · 083ab97e12
commit 083ab97e12
parent a4bdae4d63
3 changed files with 50 additions and 97 deletions
--- a/src/util/mergeConfigWithDefaults.js
+++ b/src/util/mergeConfigWithDefaults.js
@ -1,8 +1,12 @@
 import _ from 'lodash'

 export default function(userConfig, defaultConfig) {
-  return _.defaults({
-    theme: _.defaults(userConfig.theme, defaultConfig.theme),
-    variants: _.defaults(userConfig.variants, defaultConfig.variants),
-  }, userConfig, defaultConfig)
+  return _.defaults(
+    {
+      theme: _.defaults(userConfig.theme, defaultConfig.theme),
+      variants: _.defaults(userConfig.variants, defaultConfig.variants),
+    },
+    userConfig,
+    defaultConfig
+  )
 }