fix conflicts

illuminate · Jul 22, 2022 · acbb5c4 · acbb5c4
2 parents f7e2aa2 + 72a344d
commit acbb5c4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/EloquentUserProvider.php b/EloquentUserProvider.php
@@ -48,7 +48,7 @@ public function retrieveById($identifier)
         $model = $this->createModel();
 
         return $this->newModelQuery($model)
-                    ->where($model->qualifyColumn($model->getAuthIdentifierName()), $identifier)
+                    ->where($model->getAuthIdentifierName(), $identifier)
                     ->first();
     }
 
@@ -64,7 +64,7 @@ public function retrieveByToken($identifier, $token)
         $model = $this->createModel();
 
         $retrievedModel = $this->newModelQuery($model)->where(
-            $model->qualifyColumn($model->getAuthIdentifierName()), $identifier
+            $model->getAuthIdentifierName(), $identifier
         )->first();
 
         if (! $retrievedModel) {