Skip to content

Commit 859136e

Browse files
Merge branch '4.4' into 5.0
* 4.4: [Validator] fix low deps Don't patch BadFileName.php fixture file
2 parents 27254bc + 894ca8a commit 859136e

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

Mapping/GenericMetadata.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,8 @@
1212
namespace Symfony\Component\Validator\Mapping;
1313

1414
use Symfony\Component\Validator\Constraint;
15-
<<<<<<< HEAD
16-
=======
1715
use Symfony\Component\Validator\Constraints\DisableAutoMapping;
1816
use Symfony\Component\Validator\Constraints\EnableAutoMapping;
19-
use Symfony\Component\Validator\Constraints\Length;
20-
use Symfony\Component\Validator\Constraints\NotBlank;
21-
>>>>>>> 4.4
2217
use Symfony\Component\Validator\Constraints\Traverse;
2318
use Symfony\Component\Validator\Constraints\Valid;
2419
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;

0 commit comments

Comments
 (0)