fix merge

2018-02-04 18:35:11 +01:00 · 2018-02-04 18:35:11 +01:00 · 52e9f836b3
parent 78ebc6d5ce
commit 52e9f836b3
1 changed files with 1 additions and 0 deletions
--- a/src/Symfony/Component/HttpFoundation/composer.json
+++ b/src/Symfony/Component/HttpFoundation/composer.json
@ -20,6 +20,7 @@
        "symfony/polyfill-mbstring": "~1.1"
    },
    "require-dev": {
+        "predis/predis": "~1.0",
        "symfony/expression-language": "~3.4|~4.0"
    },
    "autoload": {