fix conflict

modin-project · Jun 24, 2024 · 3585c74 · 3585c74
1 parent e8925cb
commit 3585c74
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 311 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -222,7 +222,7 @@ jobs:
       with:
         filters: |
           test-small-query-compiler:
-            - 'modin/experimental/core/storage_formats/pandas/native_query_compiler.py'
+            - 'modin/core/storage_formats/pandas/native_query_compiler.py'
             - 'modin/core/storage_formats/pandas/query_compiler.py'
             - 'modin/core/storage_formats/base/query_compiler.py'
           shared: &shared

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 (