From baa6fb17d950c4f5684f5d798f90595456723418 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 16:16:46 +0800
Subject: [PATCH] conflict
---
src/logger_factory.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/logger_factory.h b/src/logger_factory.h
index e738ad9..34aef50 100644
--- a/src/logger_factory.h
+++ b/src/logger_factory.h
@@ -6,8 +6,8 @@
public:
static Logger getLogger() {
-//ERROR ALL
- static Logger logger(Logger::ERROR);
+//ERROR ALL DEBUG INFO WARN
+ static Logger logger(Logger::WARN);
return logger;
}
};
--
Gitblit v1.8.0