Update mergeConfigFrom

GrahamCampbell · GrahamCampbell · commit a5ad9a41d6e9 · 2015-01-29T18:40:22.000Z
diff --git a/src/HTMLMinServiceProvider.php b/src/HTMLMinServiceProvider.php
@@ -53,7 +53,7 @@ protected function setupConfig()
 
         $this->publishes([$source => config_path('htmlmin.php')]);
 
-        $this->mergeConfigFrom('htmlmin', $source);
+        $this->mergeConfigFrom($source, 'htmlmin');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected function setupConfig()`
`53`	`53`
`54`	`54`	`$this->publishes([$source => config_path('htmlmin.php')]);`
`55`	`55`
`56`		`- $this->mergeConfigFrom('htmlmin', $source);`
	`56`	`+ $this->mergeConfigFrom($source, 'htmlmin');`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`