diff --git a/src/Processors/QueryPlan/ReadFromRemote.cpp b/src/Processors/QueryPlan/ReadFromRemote.cpp index cec460ef3bc..3df46eb1987 100644 --- a/src/Processors/QueryPlan/ReadFromRemote.cpp +++ b/src/Processors/QueryPlan/ReadFromRemote.cpp @@ -21,13 +21,8 @@ #include #include #include -<<<<<<< HEAD #include -======= -#include -#include ->>>>>>> origin/master namespace DB {