From 89645251c50686d2b569ca08f4c71a9766b80ccd Mon Sep 17 00:00:00 2001 From: Bousk Date: Fri, 20 Apr 2018 15:30:13 +0100 Subject: [PATCH] Update ansicolor_sink.h --- include/spdlog/sinks/ansicolor_sink.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/include/spdlog/sinks/ansicolor_sink.h b/include/spdlog/sinks/ansicolor_sink.h index 64084b10..561c9a73 100644 --- a/include/spdlog/sinks/ansicolor_sink.h +++ b/include/spdlog/sinks/ansicolor_sink.h @@ -30,17 +30,10 @@ public: should_do_colors_ = details::os::in_terminal(file) && details::os::is_color_terminal(); colors_[level::trace] = white; colors_[level::debug] = cyan; -<<<<<<< HEAD - colors_[level::info] = reset; + colors_[level::info] = green; colors_[level::warn] = string(yellow) + bold; colors_[level::err] = string(red) + bold; colors_[level::critical] = string(bold) + on_red; -======= - colors_[level::info] = green; - colors_[level::warn] = yellow + bold; - colors_[level::err] = red + bold; - colors_[level::critical] = bold + on_red; ->>>>>>> upstream/master colors_[level::off] = reset; }