fix merge conflict with main

khwilson · khwilson · commit 7502951b5232 · 2025-06-15T14:21:33.000-04:00
diff --git a/cpp/src/arrow/compute/kernels/codegen_internal.h b/cpp/src/arrow/compute/kernels/codegen_internal.h
@@ -482,7 +482,8 @@ ARROW_EXPORT Result<TypeHolder> LastType(KernelContext*,
 ARROW_EXPORT Result<TypeHolder> ListValuesType(KernelContext* ctx,
                                                const std::vector<TypeHolder>& types);
 ARROW_EXPORT Result<TypeHolder> MaxPrecisionDecimalType(
-  KernelContext*, const std::vector<TypeHolder>& types);
+    KernelContext*, const std::vector<TypeHolder>& types);
+
 // ----------------------------------------------------------------------
 // Helpers for iterating over common DataType instances for adding kernels to
 // functions
diff --git a/cpp/submodules/parquet-testing b/cpp/submodules/parquet-testing
@@ -1 +1 @@
-Subproject commit 18d17540097fca7c40be3d42c167e6bfad90763c
+Subproject commit 2dc8bf140ed6e28652fc347211c7d661714c7f95
