fix conflict

illuminate · Apr 18, 2017 · 34654e2 · 34654e2
2 parents fa3806f + e01d882
commit 34654e2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/SessionGuard.php b/SessionGuard.php
@@ -5,6 +5,7 @@
 use RuntimeException;
 use Illuminate\Support\Str;
 use Illuminate\Http\Response;
+use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Session\Session;
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -16,7 +17,7 @@
 
 class SessionGuard implements StatefulGuard, SupportsBasicAuth
 {
-    use GuardHelpers;
+    use GuardHelpers, Macroable;
 
     /**
      * The name of the Guard. Typically "session".
@@ -155,7 +156,7 @@ public function user()
     /**
      * Pull a user from the repository by its "remember me" cookie token.
      *
-     * @param  string  $recaller
+     * @param  \Illuminate\Auth\Recaller  $recaller
      * @return mixed
      */
     protected function userFromRecaller($recaller)