From 5557f6439ae72c75734242f7aeaaac108c28461d Mon Sep 17 00:00:00 2001
From: Bruce Ritchie <bruce.ritchie@veeva.com>
Date: Sat, 28 Dec 2024 23:32:31 +0000
Subject: [PATCH] Fixed merge conflict

---
 datafusion/physical-expr/src/equivalence/properties.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datafusion/physical-expr/src/equivalence/properties.rs b/datafusion/physical-expr/src/equivalence/properties.rs
index f38dcbc20c4d..3afbbdf994a3 100755
--- a/datafusion/physical-expr/src/equivalence/properties.rs
+++ b/datafusion/physical-expr/src/equivalence/properties.rs
@@ -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;