fixed merge

fabpot · Jun 5, 2015 · 04630ad · 04630ad
1 parent 31eb16c
commit 04630ad
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/Symfony/Component/Validator/ExecutionContextInterface.php b/src/Symfony/Component/Validator/ExecutionContextInterface.php
@@ -100,8 +100,6 @@ interface ExecutionContextInterface
      * @param int|null $code         The violation code
      *
      * @api
-     *
-     * @deprecated the parameters $invalidValue, $plural and $code are deprecated since version 2.5 and will be removed in 3.0.
      */
     public function addViolation($message, array $params = array(), $invalidValue = null, $plural = null, $code = null);