Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix conflicts
  • Loading branch information
taylorotwell committed May 30, 2018
2 parents ce9ee67 + e716291 commit 5547913
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Middleware/Authorize.php
Expand Up @@ -42,7 +42,7 @@ public function __construct(Auth $auth, Gate $gate)
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string $ability
* @param array|null $models
* @param array|null ...$models
* @return mixed
*
* @throws \Illuminate\Auth\AuthenticationException
Expand Down
2 changes: 1 addition & 1 deletion SessionGuard.php
Expand Up @@ -91,7 +91,7 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
* @param string $name
* @param \Illuminate\Contracts\Auth\UserProvider $provider
* @param \Illuminate\Contracts\Session\Session $session
* @param \Symfony\Component\HttpFoundation\Request $request
* @param \Symfony\Component\HttpFoundation\Request|null $request
* @return void
*/
public function __construct($name,
Expand Down

0 comments on commit 5547913

Please sign in to comment.