From 9139f6deb0b3aa5734c9801af4f66175d68b6c59 Mon Sep 17 00:00:00 2001
From: Felix Baltruschat <fb@braune-digital.com>
Date: Tue, 21 Feb 2017 11:19:37 +0100
Subject: [PATCH] fix unwanted merge conflicts

---
 Security/ApiKeyUserProvider.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Security/ApiKeyUserProvider.php b/Security/ApiKeyUserProvider.php
index 1e354d1..1436cbd 100644
--- 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
 }
\ No newline at end of file