From 3fb678a0c6651365e4b00c25aeaa5bcd70bbb1fe Mon Sep 17 00:00:00 2001
From: Pablo Martelletti <pmartelletti@gmail.com>
Date: Tue, 29 Jul 2014 18:36:03 -0300
Subject: [PATCH] Remove diff info from file.

---
 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;