fix my mergefuck 😠

Author: yaauie

lib/redis/client.rb

@@ -313,7 +313,7 @@ def ensure_connected
       attempts = 0
 
       begin
-        tries += 1
+        attempts += 1
 
         if connected?
           unless inherit_socket? || Process.pid == @pid
@@ -326,11 +326,6 @@ def ensure_connected
           connect
         end
 
-<<<<<<< HEAD
-=======
-        attempts += 1
-
->>>>>>> make number of retries in ensure_connected configurable
         yield
       rescue ConnectionError, InheritedError
         disconnect