Merge pull request #1205 from crynobone/patch-2

[8.x] mergeConfigFrom() already check if app is running with config cached.

Author: driesvints

src/PassportServiceProvider.php

@@ -87,9 +87,7 @@ protected function registerMigrations()
      */
     public function register()
     {
-        if (! $this->app->configurationIsCached()) {
-            $this->mergeConfigFrom(__DIR__.'/../config/passport.php', 'passport');
-        }
+        $this->mergeConfigFrom(__DIR__.'/../config/passport.php', 'passport');
 
         $this->registerAuthorizationServer();
         $this->registerResourceServer();