mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 00:30:49 +00:00
fix build
This commit is contained in:
parent
31b17d12fd
commit
66534e3795
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user