bad merge

rapidsai · Jul 16, 2024 · d0f4ecf · d0f4ecf
1 parent 5986d0b
commit d0f4ecf
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 21 deletions.
diff --git a/python/cudf/cudf/_lib/pylibcudf/expressions.pxd b/python/cudf/cudf/_lib/pylibcudf/expressions.pxd
@@ -7,7 +7,6 @@ from cudf._lib.pylibcudf.libcudf.expressions cimport (
     expression,
     table_reference,
 )
-from cudf._lib.pylibcudf.libcudf.scalar.scalar cimport scalar
 
 from .scalar cimport Scalar
 

diff --git a/python/cudf/cudf/_lib/pylibcudf/expressions.pyx b/python/cudf/cudf/_lib/pylibcudf/expressions.pyx
@@ -1,24 +1,11 @@
 # Copyright (c) 2024, NVIDIA CORPORATION.
-<<<<<<< HEAD
-
-import numpy as np
-
-=======
->>>>>>> 6a954e299d97f69a62fd184529fa7d5f29c0e09f
 from cudf._lib.pylibcudf.libcudf.expressions import \
     ast_operator as ASTOperator  # no-cython-lint
 from cudf._lib.pylibcudf.libcudf.expressions import \
     table_reference as TableReference  # no-cython-lint
 
 from cython.operator cimport dereference
-
-<<<<<<< HEAD
-from libc.stdint cimport int64_t
-
-=======
 from libc.stdint cimport int32_t, int64_t
-
->>>>>>> 6a954e299d97f69a62fd184529fa7d5f29c0e09f
 from libcpp.memory cimport make_unique, unique_ptr
 from libcpp.string cimport string
 from libcpp.utility cimport move
@@ -30,14 +17,7 @@ from cudf._lib.pylibcudf.libcudf.scalar.scalar cimport (
     string_scalar,
     timestamp_scalar,
 )
-
-<<<<<<< HEAD
-from cudf._lib.pylibcudf.libcudf.types cimport size_type
-
-=======
 from cudf._lib.pylibcudf.libcudf.types cimport size_type, type_id
-
->>>>>>> 6a954e299d97f69a62fd184529fa7d5f29c0e09f
 from cudf._lib.pylibcudf.libcudf.wrappers.durations cimport (
     duration_ms,
     duration_ns,