fix conflicts

This commit is contained in:
taiyang-li 2022-04-07 20:52:54 +08:00
parent d7c79c3a54
commit 87507ec9e8

View File

@ -190,10 +190,6 @@ std::unique_ptr<IMergeTreeDataPart::MinMaxIndex> HiveORCFile::buildMinMaxIndex(c
return idx;
}
<<<<<<< HEAD
=======
>>>>>>> master
void HiveORCFile::loadFileMinMaxIndex()
{
if (!reader)