From 32e8a9e15a8a6ffac0d4eed16230d943be4d22db Mon Sep 17 00:00:00 2001 From: Sean Stirling Date: Mon, 18 Mar 2024 14:36:40 +0000 Subject: [PATCH] Fix conflict markers in doc --- .../sycl_ext_oneapi_bindless_images.asciidoc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sycl/doc/extensions/experimental/sycl_ext_oneapi_bindless_images.asciidoc b/sycl/doc/extensions/experimental/sycl_ext_oneapi_bindless_images.asciidoc index c76a69d154c69..a428eb2e24ed9 100644 --- a/sycl/doc/extensions/experimental/sycl_ext_oneapi_bindless_images.asciidoc +++ b/sycl/doc/extensions/experimental/sycl_ext_oneapi_bindless_images.asciidoc @@ -195,11 +195,7 @@ enum class image_type : /* unspecified */ { standard, mipmap, array, -<<<<<<< HEAD - interop, cubemap, -======= ->>>>>>> sycl }; struct image_descriptor { @@ -237,11 +233,7 @@ struct image_descriptor { The image descriptor represents the image dimensions, channel type, and channel order. An `image_type` member is also present to allow for implementation of -<<<<<<< HEAD -mipmapped, interop, and cubemapped images. -======= -mipmapped images. ->>>>>>> sycl +mipmapped, image array, and cubemapped images. The `image_descriptor` shall be default constructible and follow by-value semantics.