From 217545a7199cbfc05f908b025c117162cc34aaa8 Mon Sep 17 00:00:00 2001
From: Isaac Ault <isaac.ault@codeplay.com>
Date: Fri, 23 Feb 2024 15:13:18 +0000
Subject: [PATCH] Fix merge formatting

---
 sycl/include/sycl/detail/image_ocl_types.hpp     | 2 +-
 sycl/include/sycl/ext/oneapi/bindless_images.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sycl/include/sycl/detail/image_ocl_types.hpp b/sycl/include/sycl/detail/image_ocl_types.hpp
index def6cfeaf2d1d..93d557e509f47 100644
--- a/sycl/include/sycl/detail/image_ocl_types.hpp
+++ b/sycl/include/sycl/detail/image_ocl_types.hpp
@@ -81,7 +81,7 @@ static RetType __invoke__ImageRead(ImageT Img, CoordT Coords) {
 
 template <typename RetType, typename ImageT, typename CoordT>
 static RetType __invoke__ImageArrayFetch(ImageT Img, CoordT Coords,
-                                        int ArrayLayer) {
+                                         int ArrayLayer) {
 
   // Convert from sycl types to builtin types to get correct function mangling.
   using TempRetT = sycl::detail::ConvertToOpenCLType_t<RetType>;
diff --git a/sycl/include/sycl/ext/oneapi/bindless_images.hpp b/sycl/include/sycl/ext/oneapi/bindless_images.hpp
index aff805d01a219..7f283cb14503c 100644
--- a/sycl/include/sycl/ext/oneapi/bindless_images.hpp
+++ b/sycl/include/sycl/ext/oneapi/bindless_images.hpp
@@ -1130,7 +1130,7 @@ DataT fetch_image_array(const unsampled_image_handle &imageHandle
 #ifdef __SYCL_DEVICE_ONLY__
   if constexpr (detail::is_recognized_standard_type<DataT>()) {
     return __invoke__ImageArrayFetch<DataT>(imageHandle.raw_handle, coords,
-                                           arrayLayer);
+                                            arrayLayer);
   } else {
     static_assert(sizeof(HintT) == sizeof(DataT),
                   "When trying to fetch a user-defined type, HintT must be of "