fixed bad merge

fabpot · fabpot · commit 1a8003e8fa89 · 2016-01-25T18:01:19.000+01:00
diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json
@@ -17,12 +17,7 @@
     ],
     "minimum-stability": "dev",
     "require": {
-<<<<<<< HEAD
         "php": ">=5.5.9"
-=======
-        "php": ">=5.3.9",
-        "symfony/polyfill-apcu": "~1.1"
->>>>>>> 2.8
     },
     "require-dev": {
         "symfony/finder": "~2.8|~3.0"
