[SYCL] fix post merge issue

dklochkov-emb · dklochkov-emb · commit 64906f88ca63 · 2025-03-28T16:58:40.000+01:00
diff --git a/clang/test/CodeGenSYCL/free_function_int_header.cpp b/clang/test/CodeGenSYCL/free_function_int_header.cpp
@@ -102,7 +102,6 @@ __attribute__((sycl_device))
 void ff_8(sycl::work_group_memory<int>) {
 }
 
-<<<<<<< HEAD
 // function in namespace
 namespace free_functions {
 [[__sycl_detail__::add_ir_attributes_function("sycl-nd-range-kernel", 0)]]

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,6 @@ __attribute__((sycl_device))`
`102`	`102`	`void ff_8(sycl::work_group_memory<int>) {`
`103`	`103`	`}`
`104`	`104`
`105`		`-<<<<<<< HEAD`
`106`	`105`	`// function in namespace`
`107`	`106`	`namespace free_functions {`
`108`	`107`	`[[__sycl_detail__::add_ir_attributes_function("sycl-nd-range-kernel", 0)]]`