Skip to content

Commit 6236fdb

Browse files
pmartellettiweaverryan
authored andcommitted
Remove diff info from file.
1 parent 7c98ac7 commit 6236fdb

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

cookbook/security/voters.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@ and compare the IP address against a set of blacklisted IP addresses:
4949
protected $requestStack;
5050
private $blacklistedIp;
5151
52-
<<<<<<< HEAD
5352
public function __construct(RequestStack $requestStack, array $blacklistedIp = array())
54-
=======
55-
public function __construct(ContainerInterface $container, array $blacklistedIp = array())
56-
>>>>>>> 2.3
5753
{
5854
$this->requestStack = $requestStack;
5955
$this->blacklistedIp = $blacklistedIp;

0 commit comments

Comments
 (0)