solve conflicts

Lordworms · Mar 3, 2024 · 9632093 · 9632093
1 parent e8438e1
commit 9632093
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/datafusion/functions-array/src/kernels.rs b/datafusion/functions-array/src/kernels.rs
@@ -25,8 +25,8 @@ use arrow::array::{
 };
 use arrow::buffer::OffsetBuffer;
 use arrow::datatypes::Field;
-use arrow::datatypes::{DataType, UInt64Type};
 use arrow::datatypes::{DataType, Date32Type, IntervalMonthDayNanoType};
+use arrow::datatypes::{DataType, UInt64Type};
 use datafusion_common::cast::{
     as_date32_array, as_int64_array, as_interval_mdn_array, as_large_list_array,
     as_list_array, as_string_array,
@@ -443,6 +443,7 @@ pub fn array_ndims(args: &[ArrayRef]) -> Result<ArrayRef> {
         }
         array_type => exec_err!("array_ndims does not support type {array_type:?}"),
     }
+}
 pub fn gen_range_date(
     args: &[ArrayRef],
     include_upper: i32,