Update SharedQueryBlockInputStream.h

pingcap · Aug 26, 2021 · 18ea790 · 18ea790
1 parent 2194c9d
commit 18ea790
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/dbms/src/DataStreams/SharedQueryBlockInputStream.h b/dbms/src/DataStreams/SharedQueryBlockInputStream.h
@@ -1,14 +1,9 @@
 #pragma once
 
 #include <Common/ConcurrentBoundedQueue.h>
-<<<<<<< HEAD
 #include <common/logger_useful.h>
-=======
-#include <Common/ThreadFactory.h>
->>>>>>> 5ecb23a58 (fix bug that SharedQueryBlockInputStream may loss block randomly (#2759))
 #include <Common/typeid_cast.h>
 #include <DataStreams/IProfilingBlockInputStream.h>
-#include <common/logger_useful.h>
 
 #include <thread>