Permalink
Browse files

minor #4068 Remove diff info from cookbook/security/voters.rst (pmart…

…elletti)

This PR was submitted for the 2.5 branch but it was merged into the 2.4 branch instead (closes #4068).

Discussion
----------

Remove diff info from cookbook/security/voters.rst

Commits
-------

3fb678a Remove diff info from file.
  • Loading branch information...
weaverryan committed Jul 30, 2014
2 parents 7c98ac7 + 6236fdb commit a7fe00fedea3ba89089a2de6fb54970cdbe2440e
Showing with 0 additions and 4 deletions.
  1. +0 −4 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;

0 comments on commit a7fe00f

Please sign in to comment.