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

xabbuh · xabbuh · commit 1a1aaa74d666 · 2018-01-20T13:12:25.000+01:00
This reverts commit f1f18ad, reversing changes made to 8e8ee09.
diff --git a/composer.json b/composer.json
@@ -85,7 +85,6 @@
         "sensio/framework-extra-bundle": "^3.0.2"
     },
     "conflict": {
-        "egulias/email-validator": ">=2.0",
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
     },
     "autoload": {
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -42,9 +42,6 @@
         "symfony/property-access": "For using the 2.4 Validator API",
         "symfony/expression-language": "For using the 2.4 Expression validator"
     },
-    "conflict": {
-        "egulias/email-validator": ">=2.0"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Validator\\": "" },
         "exclude-from-classmap": [
