fix conflicts

kokkos · Jul 29, 2024 · dd8c5f9 · dd8c5f9
1 parent 07282b9
commit dd8c5f9
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/common/src/KokkosFFT_utils.hpp b/common/src/KokkosFFT_utils.hpp
@@ -56,15 +56,9 @@ auto convert_negative_axis(ViewType, int _axis = -1) {
   static_assert(Kokkos::is_view<ViewType>::value,
                 "convert_negative_axis: ViewType is not a Kokkos::View.");
   int rank = static_cast<int>(ViewType::rank());
-<<<<<<< HEAD
-  if (_axis < -rank || _axis >= rank) {
-    throw std::runtime_error("axis should be in [-rank, rank-1]");
-  }
-=======
 
   KOKKOSFFT_EXPECTS(_axis >= -rank && _axis < rank,
                     "Axis must be in [-rank, rank-1]");
->>>>>>> a786585 (improve assertion)
 
   int axis = _axis < 0 ? rank + _axis : _axis;
   return axis;