fixed bad merge

2016-01-25 18:01:19 +01:00 · 2016-01-25 18:01:19 +01:00 · 1a8003e8fa
commit 1a8003e8fa
parent f521c11097
1 changed files with 0 additions and 5 deletions
--- 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"