fix merge conflict

apache · Jun 7, 2024 · 204dd59 · 204dd59
1 parent 397146a
commit 204dd59
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/core/src/execution/datafusion/expressions/mod.rs b/core/src/execution/datafusion/expressions/mod.rs
@@ -29,11 +29,8 @@ pub mod avg_decimal;
 pub mod bloom_filter_might_contain;
 pub mod correlation;
 pub mod covariance;
-<<<<<<< HEAD
 pub mod regexp;
-=======
 pub mod negative;
->>>>>>> apache/main
 pub mod stats;
 pub mod stddev;
 pub mod strings;

diff --git a/core/src/execution/datafusion/planner.rs b/core/src/execution/datafusion/planner.rs
@@ -70,11 +70,8 @@ use crate::{
                 correlation::Correlation,
                 covariance::Covariance,
                 if_expr::IfExpr,
-<<<<<<< HEAD
                 regexp::RLike,
-=======
                 negative,
->>>>>>> apache/main
                 scalar_funcs::create_comet_physical_fun,
                 stats::StatsType,
                 stddev::Stddev,