From 9ee6fc15e1ed3187ff11e320cefe88daccec9c45 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Wed, 10 Apr 2019 21:42:23 +0200
Subject: [PATCH] fixed bad merge

---
 .../Tests/Constraints/ChoiceValidatorTest.php         | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
index 728fa36c52..2f703b8fd5 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
@@ -98,22 +98,11 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
 
     public function testValidChoiceCallbackClosure()
     {
-<<<<<<< HEAD
-        $constraint = new Choice(
-            [
-                'callback' => function () {
-                    return ['foo', 'bar'];
-                },
-            ]
-        );
-=======
         $constraint = new Choice([
-            'strict' => true,
             'callback' => function () {
                 return ['foo', 'bar'];
             },
         ]);
->>>>>>> 3.4
 
         $this->validator->validate('bar', $constraint);