clean after cherry-pick

This commit is contained in:
NIKITA MIKHAILOV 2019-07-10 16:27:16 +03:00
parent 865606b83c
commit e05f5388bc
2 changed files with 0 additions and 9 deletions

View File

@ -29,11 +29,6 @@
#include <DataTypes/DataTypeLowCardinality.h>
#include <Compression/CompressionFactory.h>
#include <common/logger_useful.h>
<<<<<<< HEAD
=======
#include <iostream>
>>>>>>> aa54091152... bugfix client logs + some tests
#include "TCPHandler.h"

View File

@ -134,12 +134,8 @@ public:
return thread_state == Died ? nullptr : logs_queue_ptr.lock();
}
<<<<<<< HEAD
void attachInternalTextLogsQueue(const InternalTextLogsQueuePtr & logs_queue, LogsLevel client_logs_level);
=======
void attachInternalTextLogsQueue(const InternalTextLogsQueuePtr & logs_queue,
LogsLevel client_logs_level);
>>>>>>> aa54091152... bugfix client logs + some tests
/// Sets query context for current thread and its thread group
/// NOTE: query_context have to be alive until detachQuery() is called