Commit1a1aaa7

committed

Revert "bug#25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)"

This reverts commitf1f18ad, reversingchanges made to8e8ee09.

1 parentf1f18ad commit1a1aaa7Copy full SHA for 1a1aaa7

File tree

-4

lines changed

-4

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@`
`85`	`85`	`"sensio/framework-extra-bundle":"^3.0.2"`
`86`	`86`	`},`
`87`	`87`	`"conflict": {`
`88`		`-"egulias/email-validator":">=2.0",`
`89`	`88`	`"phpunit/phpunit":"<4.8.35\|<5.4.3,>=5.0"`
`90`	`89`	`},`
`91`	`90`	`"autoload": {`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,6 @@`
`42`	`42`	`"symfony/property-access":"For using the 2.4 Validator API",`
`43`	`43`	`"symfony/expression-language":"For using the 2.4 Expression validator"`
`44`	`44`	`},`
`45`		`-"conflict": {`
`46`		`-"egulias/email-validator":">=2.0"`
`47`		`- },`
`48`	`45`	`"autoload": {`
`49`	`46`	`"psr-4": {"Symfony\\Component\\Validator\\":"" },`
`50`	`47`	`"exclude-from-classmap": [`

Comments

(0)