Delete some mistakes

diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py
index 5077e9995e3bf652d3dffebebed83556fec95807..8940b8731a128fadd4ce86fc4ba6b654dc9676be 100644 (file)
--- a/python.d/python_modules/base.py
+++ b/python.d/python_modules/base.py
@@ -692,11 +692,7 @@ class SocketService(SimpleService):
                 break
 
             self.debug("received data:", str(buf))
-<<<<<<< HEAD
             data += buf.decode('utf-8', 'ignore')
-=======
-            data += buf.decode(errors='ignore')
->>>>>>> upstream/master
             if self._check_raw_data(data):
                 break
 

diff --git a/python.d/redis.chart.py b/python.d/redis.chart.py
index 7ed343de497a9eb281d9e0e48c958229aa0beb1f..61f4f6d619590c63769c83f5b469644db64c7396 100644 (file)
--- 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