Delete some mistakes

leolovenet · leolovenet · commit e56d53caa66b · 2016-11-17T03:40:23.000+08:00
diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py
@@ -692,11 +692,7 @@ def _receive(self):
                 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
@@ -99,7 +99,6 @@ def _get_data(self):
         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 @@ def _get_data(self):
                 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
