thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Anton Popov 2024-08-08 16:32:40 +00:00
parent 31b17d12fd
commit 66534e3795
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Processors/QueryPlan/ReadFromMergeTree.cpp
View File

@ -1561,12 +1561,8 @@ void ReadFromMergeTree::applyFilters(ActionDAGNodes added_filter_nodes)
mutations_snapshot,
context,
query_info,
<<<<<<< HEAD
metadata_for_reading,
storage_snapshot->metadata,
log);
=======
storage_snapshot->metadata);
>>>>>>> upstream/master
}
}