From b2f3a8b5203816fcfc3770d2897866d20cb35394 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 19 Jul 2016 12:46:18 +0200
Subject: [PATCH] fixed bad merge

---
 src/Symfony/Component/Validator/composer.json | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index 577ea3b251..7b19ae2382 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -21,20 +21,11 @@
         "symfony/translation": "~2.8|~3.0"
     },
     "require-dev": {
-<<<<<<< HEAD
         "symfony/http-foundation": "~2.8|~3.0",
         "symfony/intl": "~2.8|~3.0",
         "symfony/yaml": "~2.8|~3.0",
         "symfony/config": "~2.8|~3.0",
         "symfony/expression-language": "~2.8|~3.0",
-=======
-        "symfony/http-foundation": "~2.3|~3.0.0",
-        "symfony/intl": "~2.7.4|~2.8|~3.0.0",
-        "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
-        "symfony/config": "~2.2|~3.0.0",
-        "symfony/property-access": "~2.3|~3.0.0",
-        "symfony/expression-language": "~2.4|~3.0.0",
->>>>>>> 2.8
         "doctrine/annotations": "~1.0",
         "doctrine/cache": "~1.0",
         "egulias/email-validator": "~1.2,>=1.2.1"