Merge pull request #4 from GrahamCampbell/patch-1

Fixed the service provider
LaravelBA · Feb 9, 2015 · e35cf25 · e35cf25
2 parents bb68aff + af1c45e
commit e35cf25
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/RouteBinderServiceProvider.php b/src/RouteBinderServiceProvider.php
@@ -20,7 +20,7 @@ final class RouteBinderServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->mergeConfigFrom(__DIR__.'/config/route-binder.php', 'route-binder');
+        //
     }
 
     /**
@@ -36,6 +36,8 @@ public function boot(Repository $config, Registrar $router)
             __DIR__.'/config/route-binder.php' => $this->app->make('path.config') . '/route-binder.php',
         ], 'config');
 
+        $this->mergeConfigFrom(__DIR__.'/config/route-binder.php', 'route-binder');
+
         $this->bootRoutes($config, $router);
     }