diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Make.WarpX | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/Make.WarpX b/Source/Make.WarpX index 1dfffbbb6..13d4f4554 100644 --- a/Source/Make.WarpX +++ b/Source/Make.WarpX @@ -175,11 +175,7 @@ ifeq ($(USE_HDF5),TRUE) LIBRARY_LOCATIONS += $(HDF5_HOME)/lib endif DEFINES += -DWARPX_USE_HDF5 -<<<<<<< HEAD - LIBRARIES += -lhdf5 -lz -======= libraries += -lhdf5 -lz ->>>>>>> dev endif # job_info support |