From e56d53caa66b27dd124b6e05960560e6bfb9f345 Mon Sep 17 00:00:00 2001
From: liu lei <leolovenet@gmail.com>
Date: Thu, 17 Nov 2016 03:40:23 +0800
Subject: Delete some mistakes

---
 python.d/redis.chart.py | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'python.d/redis.chart.py')

diff --git a/python.d/redis.chart.py b/python.d/redis.chart.py
index 7ed343de49..61f4f6d619 100644
--- a/python.d/redis.chart.py
+++ b/python.d/redis.chart.py
@@ -99,7 +99,6 @@ class Service(SocketService):
         Get data from socket
         :return: dict
         """
-<<<<<<< HEAD
         if self.passwd:
             info_request = self.request
             self.request = "AUTH " + self.passwd + "\r\n"
@@ -108,9 +107,6 @@ class Service(SocketService):
                 self.error("invalid password")
                 return None
             self.request = info_request
-
-=======
->>>>>>> upstream/master
         response = self._get_raw_data()
         if response is None:
             # error has already been logged
-- 
cgit v1.2.3