message: reverting formatting changes
diff: #include <ostream>
  #include <string>
  -namespace rajaperf {
  +namespace rajaperf
  +{
  class KernelBase;
  class RunParams;
  @@ -53,6 +54,7 @@ enum GroupID {
  };
  +
  //
  /*!
  *******************************************************************************
  @@ -90,6 +92,7 @@ enum KernelID {
  #ifdef RUN_KOKKOS // move this up to the point implemented with Kokkos
  NumKernels,
  #endif
  +
  //
  // Lcals kernels...
  //
  @@ -134,7 +137,10 @@ enum KernelID {
  //
  // Apps kernels...
  //
  +<<<<<<< HEAD
  Apps_CONVECTION3DPA,
  +=======
  +>>>>>>> 78348cb9 (reverting formatting changes)
  Apps_COUPLE,
  Apps_DEL_DOT_VEC_2D,
  Apps_DIFFUSION3DPA,
  @@ -152,7 +158,10 @@ enum KernelID {
  //
  // Algorithm kernels...
  //
  +<<<<<<< HEAD
  Algorithm_SCAN,
  +=======
  +>>>>>>> 78348cb9 (reverting formatting changes)
  Algorithm_SORT,
  Algorithm_SORTPAIRS,
  Algorithm_REDUCE_SUM,
  @@ -165,6 +174,7 @@ enum KernelID {
  };
  +
  /*!
  *******************************************************************************
  *
  @@ -204,6 +214,7 @@ enum VariantID {
  };
  +
  /*!
  *******************************************************************************
  *
  @@ -235,6 +246,7 @@ enum FeatureID {
  };
  +
  /*!
  *******************************************************************************
  *
  @@ -398,6 +410,6 @@ auto getViewFromPointer(PointedAt *kokkos_ptr, Boundaries... boundaries)
  // An allocation is implicitly made here
  device_view_type device_data_copy("StringName", boundaries...);
  -} // namespace rajaperf
  +} // closing brace for rajaperf namespace
  #endif // closing endif for header file include guard
  