fix bad merge again

ax3l · Jan 5, 2024 · 69493e9 · 69493e9
1 parent f06a9c7
commit 69493e9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Source/Particles/Sorting/SortingUtils.H b/Source/Particles/Sorting/SortingUtils.H
@@ -100,11 +100,7 @@ class fillBufferFlag
 
 
         AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
-<<<<<<< HEAD
-        void operator()( const long i ) const {
-=======
         void operator()( const int i ) const {
->>>>>>> 514df482be5a2565be56acf5fc4b9bcc9d89273b
             // Find the index of the cell where this particle is located
             amrex::IntVect const iv = amrex::getParticleCell( m_ptd, i,
                                 m_prob_lo, m_inv_cell_size, m_domain );