fix conflicts

This commit is contained in:
Taylor Otwell
2017-04-07 08:11:06 -05:00
21 changed files with 83 additions and 44 deletions

View File

@@ -60,6 +60,6 @@ class Handler extends ExceptionHandler
return response()->json(['error' => 'Unauthenticated.'], 401);
}
return redirect()->guest('login');
return redirect()->guest(route('login'));
}
}

View File

@@ -13,7 +13,7 @@ class EventServiceProvider extends ServiceProvider
* @var array
*/
protected $listen = [
'App\Events\SomeEvent' => [
'App\Events\Event' => [
'App\Listeners\EventListener',
],
];