Fix merging issue

uxlfoundation · Dec 20, 2024 · 64610c6 · 64610c6
1 parent 559ce1e
commit 64610c6
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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