From 64610c61f559c0485bbe6c310a52f82c88f2814f Mon Sep 17 00:00:00 2001
From: "Boyarinov, Konstantin" <konstantin.boyarinov@intel.com>
Date: Fri, 20 Dec 2024 04:22:32 -0800
Subject: [PATCH] Fix merging issue

---
 include/oneapi/tbb/blocked_range.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/include/oneapi/tbb/blocked_range.h b/include/oneapi/tbb/blocked_range.h
index 77afcca392..51312a1a87 100644
--- a/include/oneapi/tbb/blocked_range.h
+++ b/include/oneapi/tbb/blocked_range.h
@@ -151,12 +151,7 @@ class blocked_range {
     friend class blocked_range3d;
 
     template<typename DimValue, unsigned int N, typename>
-<<<<<<< HEAD
-        __TBB_requires(blocked_range_value<DimValue>)
     friend class blocked_nd_range_impl;
-=======
-    friend class blocked_rangeNd_impl;
->>>>>>> 3fe65dcb (Fix constraits test failure)
 };
 
 } // namespace d1