fix unwanted merge conflicts

braune-digital · Feb 21, 2017 · 9139f6d · 9139f6d
1 parent 9f744be
commit 9139f6d
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/Security/ApiKeyUserProvider.php b/Security/ApiKeyUserProvider.php
@@ -2,10 +2,7 @@
 
 namespace BrauneDigital\ApiBaseBundle\Security;
 
-<<<<<<< Updated upstream
-=======
 use Doctrine\ORM\NoResultException;
->>>>>>> Stashed changes
 use FOS\UserBundle\Security\UserProvider;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
@@ -17,12 +14,6 @@ class ApiKeyUserProvider extends UserProvider
      */
     protected $container;
 
-<<<<<<< Updated upstream
-	public function getUserForApiKey($apiKey)
-	{
-		return $this->userManager->findUserBy(array('token' => $apiKey));
-	}
-=======
     public function getUserForApiKey($apiKey)
     {
         $features = $this->container->getParameter('braune_digital_api_base.features');
@@ -59,5 +50,4 @@ public function setContainer($container)
     }
 
 
->>>>>>> Stashed changes
 }