fix imports

rapidsai · Sep 25, 2024 · 99651c1 · 99651c1
1 parent bab22d7
commit 99651c1
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/python/cudf/cudf/_lib/strings/findall.pyx b/python/cudf/cudf/_lib/strings/findall.pyx
@@ -4,18 +4,6 @@ from libc.stdint cimport uint32_t
 
 from cudf.core.buffer import acquire_spill_lock
 
-<<<<<<< HEAD
-from pylibcudf.libcudf.column.column cimport column
-from pylibcudf.libcudf.column.column_view cimport column_view
-from pylibcudf.libcudf.strings.findall cimport (
-    find_re as cpp_find_re,
-    findall as cpp_findall,
-)
-from pylibcudf.libcudf.strings.regex_flags cimport regex_flags
-from pylibcudf.libcudf.strings.regex_program cimport regex_program
-
-=======
->>>>>>> branch-24.12
 from cudf._lib.column cimport Column
 
 import pylibcudf as plc