fix conflict

wangzhengquan

2020-10-30 5d0308e79a5dff5b040504a17c6300bafdeb1499

 src/socket/mod_socket.c

@@ -7,7 +7,7 @@
#include "sem_util.h"
#include "logger_factory.h"

static Logger logger = LoggerFactory::getLogger();
static Logger *logger = LoggerFactory::getLogger();

typedef struct mod_entry_t
{