Skip to content

Commit

Permalink
Fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Omega359 committed Dec 28, 2024
1 parent 1041525 commit 5557f64
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion datafusion/physical-expr/src/equivalence/properties.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2271,8 +2271,8 @@ mod tests {

use arrow::datatypes::{DataType, Field, Schema};
use arrow_schema::{Fields, TimeUnit};
use datafusion_common::ScalarValue;
use datafusion_common::config::ConfigOptions;
use datafusion_common::ScalarValue;
use datafusion_expr::Operator;

use datafusion_functions::string::concat;
Expand Down

0 comments on commit 5557f64

Please sign in to comment.