fixed bad merge

Author: fabpot

composer.json

@@ -21,19 +21,11 @@
         "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
-<<<<<<< HEAD
         "symfony/stopwatch": "~2.8|~3.0",
         "symfony/dependency-injection": "~2.8|~3.0",
-        "symfony/form": "~3.0",
+        "symfony/form": "~3.0,>=3.0.5",
         "symfony/http-kernel": "~2.8|~3.0",
         "symfony/property-access": "~2.8|~3.0",
-=======
-        "symfony/stopwatch": "~2.2|~3.0.0",
-        "symfony/dependency-injection": "~2.2|~3.0.0",
-        "symfony/form": "~2.8.5|~3.0.5",
-        "symfony/http-kernel": "~2.2|~3.0.0",
-        "symfony/property-access": "~2.3|~3.0.0",
->>>>>>> 2.8
         "symfony/property-info": "~2.8|3.0",
         "symfony/security": "~2.8|~3.0",
         "symfony/expression-language": "~2.8|~3.0",