From 52e9f836b35c3d444f031c16cf6dc725867d765a Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 4 Feb 2018 18:35:11 +0100
Subject: [PATCH] fix merge

---
 src/Symfony/Component/HttpFoundation/composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
index e636afc013..ef4bf826e5 100644
--- 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": {