From db88baa6c6b9472e814248bf5ad720c574fae19b Mon Sep 17 00:00:00 2001
From: manindersingh <maninder.babra@gmail.com>
Date: Wed, 30 Jul 2014 14:42:38 +0530
Subject: [PATCH] Fixed wrong git conflict resolve

---
 cookbook/security/voters.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cookbook/security/voters.rst b/cookbook/security/voters.rst
index 69e67944b4c..1760cb43db7 100644
--- a/cookbook/security/voters.rst
+++ b/cookbook/security/voters.rst
@@ -49,11 +49,7 @@ and compare the IP address against a set of blacklisted IP addresses:
         protected $requestStack;
         private $blacklistedIp;
 
-<<<<<<< HEAD
         public function __construct(RequestStack $requestStack, array $blacklistedIp = array())
-=======
-        public function __construct(ContainerInterface $container, array $blacklistedIp = array())
->>>>>>> 2.3
         {
             $this->requestStack  = $requestStack;
             $this->blacklistedIp = $blacklistedIp;