mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-24 08:32:02 +00:00
fix conflicts
This commit is contained in:
parent
d7c79c3a54
commit
87507ec9e8
@ -190,10 +190,6 @@ std::unique_ptr<IMergeTreeDataPart::MinMaxIndex> HiveORCFile::buildMinMaxIndex(c
|
||||
return idx;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> master
|
||||
void HiveORCFile::loadFileMinMaxIndex()
|
||||
{
|
||||
if (!reader)
|
||||
|
Loading…
Reference in New Issue
Block a user