fixed bad merge

ax3l · Jan 5, 2024 · f06a9c7 · f06a9c7
1 parent a931bc5
commit f06a9c7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Source/Diagnostics/WarpXOpenPMD.cpp b/Source/Diagnostics/WarpXOpenPMD.cpp
@@ -877,11 +877,7 @@ WarpXOpenPMDPlot::SaveRealProperty (ParticleIter& pti,
 
 {
   auto const numParticleOnTile = pti.numParticles();
-<<<<<<< HEAD
-  uint64_t const numParticleOnTile64 = static_cast<uint64_t>( numParticleOnTile );
-=======
   auto const numParticleOnTile64 = static_cast<uint64_t>(numParticleOnTile);
->>>>>>> 514df482be5a2565be56acf5fc4b9bcc9d89273b
   auto const& soa = pti.GetStructOfArrays();
 
   auto const getComponentRecord = [&currSpecies](std::string const comp_name) {