From c35e78268e986c24fa7d4f1a9379fbc4e393be7d Mon Sep 17 00:00:00 2001
From: lhausamm <loic_hausammann@hotmail.com>
Date: Thu, 31 May 2018 10:59:52 +0200
Subject: [PATCH] Remove conflict flag
---
src/hydro/Gadget2/hydro_io.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/hydro/Gadget2/hydro_io.h b/src/hydro/Gadget2/hydro_io.h
index dab03600a8..597c48c017 100644
--- a/src/hydro/Gadget2/hydro_io.h
+++ b/src/hydro/Gadget2/hydro_io.h
@@ -212,6 +212,5 @@ __attribute__((always_inline)) INLINE static void hydro_write_flavour(
__attribute__((always_inline)) INLINE static int writeEntropyFlag(void) {
return 0;
}
->>>>>>> Check if all parameters in output_fields are correct
#endif /* SWIFT_GADGET2_HYDRO_IO_H */
--
GitLab