From 0e68ac4e4db680101b8b4f6e03cfd92b7cb3b45b Mon Sep 17 00:00:00 2001
From: Mallik Hassan <sadi.research@gmail.com>
Date: Tue, 26 Jul 2022 11:34:17 -0300
Subject: [PATCH] Update BaseDaemon.cpp

removed conflict markers from BaseDaemon.cpp
---
 src/Daemon/BaseDaemon.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Daemon/BaseDaemon.cpp b/src/Daemon/BaseDaemon.cpp
index 2a3b24b6999..e162360ddaa 100644
--- a/src/Daemon/BaseDaemon.cpp
+++ b/src/Daemon/BaseDaemon.cpp
@@ -1018,10 +1018,6 @@ void BaseDaemon::setupWatchdog()
                 pf = new OwnJSONPatternFormatter;
             else
                 pf = new OwnPatternFormatter(true);
-<<<<<<< HEAD
-
-=======
->>>>>>> removed pFormattterJSON pointer from OwnFormattingChannel and reformatted Loggers and BaseDaemon to look nicer
             Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, new Poco::ConsoleChannel(std::cerr));
             logger().setChannel(log);
         }