Skip to content

Commit

Permalink
fixed another merge issue.
Browse files Browse the repository at this point in the history
  • Loading branch information
JustinRayAngus committed Jul 20, 2024
1 parent d86ad9e commit 3d4355e
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public:
amrex::ParticleReal const T1, amrex::ParticleReal const T2,
amrex::ParticleReal const q1, amrex::ParticleReal const q2,
amrex::ParticleReal const m1, amrex::ParticleReal const m2,
amrex::Real const dt, amrex::Real const /*dV*/, index_type coll_idx,
amrex::Real const dt, amrex::Real const dV, index_type coll_idx,
index_type const /*cell_start_pair*/, index_type* /*p_mask*/,
index_type* /*p_pair_indices_1*/, index_type* /*p_pair_indices_2*/,
amrex::ParticleReal* /*p_pair_reaction_weight*/,
Expand Down

0 comments on commit 3d4355e

Please sign in to comment.