fix conflict

modin-project · Jun 24, 2024 · 8c6ad55 · 8c6ad55
1 parent e8925cb
commit 8c6ad55
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 310 deletions.
diff --git a/modin/tests/pandas/dataframe/test_indexing.py b/modin/tests/pandas/dataframe/test_indexing.py
@@ -21,11 +21,7 @@
 from pandas._testing import ensure_clean
 
 import modin.pandas as pd
-<<<<<<< HEAD
-from modin.config import MinRowPartitionSize, NPartitions, UsePlainPandasQueryCompiler
-=======
-from modin.config import MinPartitionSize, NativeDataframeMode, NPartitions
->>>>>>> 1984aa1f (renaming to PlainPandasQueryCompiler to NativeDataframeMode)
+from modin.config import MinRowPartitionSize, NativeDataframeMode, NPartitions
 from modin.pandas.indexing import is_range_like
 from modin.pandas.testing import assert_index_equal
 from modin.tests.pandas.utils import (