Update mergeConfigFrom

GrahamCampbell · GrahamCampbell · commit ef146b074e82 · 2015-01-29T18:49:08.000Z
diff --git a/src/ParseServiceProvider.php b/src/ParseServiceProvider.php
@@ -45,7 +45,7 @@ protected function setupConfig()
 
         $this->publishes([$source => config_path('parse.php')]);
 
-        $this->mergeConfigFrom('parse', $source);
+        $this->mergeConfigFrom($source, 'parse');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected function setupConfig()`
`45`	`45`
`46`	`46`	`$this->publishes([$source => config_path('parse.php')]);`
`47`	`47`
`48`		`- $this->mergeConfigFrom('parse', $source);`
	`48`	`+ $this->mergeConfigFrom($source, 'parse');`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`