diff options
Diffstat (limited to 'Source/WarpX.H')
| -rw-r--r-- | Source/WarpX.H | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/WarpX.H b/Source/WarpX.H index 4c22499be..7d34178f5 100644 --- a/Source/WarpX.H +++ b/Source/WarpX.H @@ -401,10 +401,7 @@ private: std::array<std::unique_ptr<amrex::MultiFab>, 3> getInterpolatedE(int lev) const; std::array<std::unique_ptr<amrex::MultiFab>, 3> getInterpolatedB(int lev) const; -<<<<<<< HEAD -======= ->>>>>>> dev void SyncCurrent (const std::array<const amrex::MultiFab*,3>& fine, const std::array< amrex::MultiFab*,3>& crse, int ref_ratio); |