fix merge

AMReX-Astro · Jun 27, 2024 · ee44abf · ee44abf
1 parent 7ee2478
commit ee44abf
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/Source/hydro/Make.package b/Source/hydro/Make.package
@@ -29,13 +29,8 @@ CEXE_headers += ppm.H
 CEXE_sources += riemann.cpp
 CEXE_headers += HLL_solvers.H
 CEXE_headers += riemann_solvers.H
-<<<<<<< HEAD
-CEXE_headers += riemann.H
-=======
 CEXE_headers += riemann_2shock_solvers.H
-CEXE_sources += riemann_util.cpp
 CEXE_headers += riemann_type.H
->>>>>>> riemann_reorg_3
 CEXE_headers += slope.H
 CEXE_headers += reconstruction.H
 CEXE_sources += trace_plm.cpp