diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2019-07-11 14:41:48 -0700 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2019-07-11 14:41:48 -0700 |
| commit | 0f78e8678b7ca97628e70889dba1b6a232be22eb (patch) | |
| tree | df7ccc06b58e35ab2807c32c0035ca80894deed5 /Source | |
| parent | 7840eb4dc964c737211f0a78aba0d7df6ff4c01d (diff) | |
| download | WarpX-0f78e8678b7ca97628e70889dba1b6a232be22eb.tar.gz WarpX-0f78e8678b7ca97628e70889dba1b6a232be22eb.tar.zst WarpX-0f78e8678b7ca97628e70889dba1b6a232be22eb.zip | |
remove merge conflict markers
Diffstat (limited to 'Source')
| -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); |