diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Particles/MultiParticleContainer.H | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/Particles/MultiParticleContainer.H b/Source/Particles/MultiParticleContainer.H index c1825cd4b..97d309c45 100644 --- a/Source/Particles/MultiParticleContainer.H +++ b/Source/Particles/MultiParticleContainer.H @@ -196,14 +196,12 @@ public: PhysicalParticleContainer& GetPCtmp () { return *pc_tmp; } -<<<<<<< HEAD + #ifdef WARPX_QED warpx_breit_wheeler_engine bw_engine; warpx_quantum_sync_engine qs_engine; #endif -======= ->>>>>>> dev protected: // Particle container types |