resolve conflicts

codetyri0n · codetyri0n · commit 0794846aa3c6 · 2026-01-11T02:10:02.000+05:30
diff --git a/datafusion/functions/src/datetime/common.rs b/datafusion/functions/src/datetime/common.rs
@@ -38,7 +38,6 @@ use datafusion_common::{
     DataFusionError, Result, ScalarType, ScalarValue, exec_datafusion_err, exec_err,
     internal_datafusion_err, unwrap_or_internal_err,
 };
-
 use datafusion_expr::ColumnarValue;
 
 /// Error message if nanosecond conversion request beyond supported interval
