8000 fixed bad merge · symfony/symfony@dd47fda · GitHub
[go: up one dir, main page]
Skip to content

Commit dd47fda

Browse files
fabpotfabpot
committed
fixed bad merge
1 parent 460da96 commit dd47fda

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

‎src/Symfony/Component/Validator/CHANGELOG.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@ CHANGELOG
88
* added UATP cards support to `CardSchemeValidator`
99
* added option `allowNull` to NotBlank constraint
1010
* added `Json` constraint
11-
<<<<<<< HEAD
1211
* added `Unique` constraint
13-
14-
=======
1512
* added a new `normalizer` option to the string constraints and to the `NotBlank` constraint
1613

17-
>>>>>>> pull/26484
1814
4.2.0
1915
-----
2016

0 commit comments

Comments
 (0)
0