From c73344c3ae6291f5b5c109c18ccc37d53dc9f3f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Wed, 24 Apr 2019 17:14:51 +0200
Subject: [PATCH] merge

---
 src/StorageDrivers/RedisStorageDriver.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/StorageDrivers/RedisStorageDriver.php b/src/StorageDrivers/RedisStorageDriver.php
index 57b2b1f7..3241a9ba 100644
--- a/src/StorageDrivers/RedisStorageDriver.php
+++ b/src/StorageDrivers/RedisStorageDriver.php
@@ -81,10 +81,6 @@ class RedisStorageDriver implements StorageDriver
                 $tenant = substr($tenant, strlen($redis_prefix));
             }
 
-<<<<<<< HEAD
-        return \array_map(function ($tenant) {
-=======
->>>>>>> 1.x
             return $this->redis->hgetall($tenant);
         }, $hashes);
     }