fix rebase typo

tomwer/web/client.py

@@ -31,14 +31,11 @@ __license__ = "MIT"
 __date__ = "28/04/2017"
 
 
-<<<<<<< HEAD
 try:
     import graypy
     has_graypy = True
 except:
     has_graypy = False
-=======
->>>>>>> 1ab687cfd... move graypy handler from from the OWClient to move it in the launcher side
 from .config import grayport_port, grayport_host
 import os
 import socket
@@ -68,37 +65,6 @@ class OWClient(object):
                 _logger.warning('unknow host %s' % grayport_host)
                 _INFO_UNKNOWN_HOST_NAME = True
             return
-<<<<<<< HEAD
-        if type(loggers) not in (list, tuple):
-            loggers = (loggers, )
-        if not has_graypy:
-            _logger.info('graypy not install. No log will be send to graylog')
-            return
-        for logger in loggers:
-            if os.environ.get('ORANGE_WEB_LOG', 'True') == 'True':
-                if hasattr(graypy, 'GELFHandler'):
-                    constructor = graypy.GELFHandler
-                elif hasattr(graypy, 'GELFUDPHandler'):
-                    constructor = graypy.GELFUDPHandler
-                else:
-                    logger.warning('Fail to find the correct constructor from graypy')
-                    return
-
-                try:
-                    self.graylogHandler = constructor(grayport_host, grayport_port)
-                except:
-                    if OWClient._log_graylog_err:
-                        logger.warning('Fail to create GELFHandler. Won\'t report log message')
-                        OWClient._log_graylog_err = False
-                else:
-                    logger.addHandler(self.graylogHandler)
-                    logger.debug('- add graypy handler')
-            else:
-                info = 'No log will be send to graylog.'
-                info += 'ORANGE_WEB_LOG variable is setted to False'
-                logger.debug(info)
-=======
->>>>>>> 1ab687cfd... move graypy handler from from the OWClient to move it in the launcher side
 
     @staticmethod
     def _knows_hostname(hostname):