fix mege conflicts with dev

1 files changed, 2 insertions, 0 deletions

diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index 173a3a00f..39505e47b 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -73,6 +73,7 @@ bool WarpX::do_back_transformed_particles = true;
 
 int  WarpX::num_slice_snapshots_lab = 0;
 Real WarpX::dt_slice_snapshots_lab;
+Real WarpX::particle_slice_width_lab = 0.0;
 
 bool WarpX::do_dynamic_scheduling = true;
 
@@ -612,6 +613,7 @@ WarpX::ReadParameters ()
           pp.query("num_slice_snapshots_lab", num_slice_snapshots_lab);
           if (num_slice_snapshots_lab > 0) {
              pp.get("dt_slice_snapshots_lab", dt_slice_snapshots_lab );
+             pp.get("particle_slice_width_lab",particle_slice_width_lab);
           }
        }