fixed bad merge

Author: fabpot

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"