Skip to content
Snippets Groups Projects
Commit c35e7826 authored by lhausamm's avatar lhausamm
Browse files

Remove conflict flag

parent e22677fe
No related branches found
No related tags found
1 merge request!520Select io
...@@ -212,6 +212,5 @@ __attribute__((always_inline)) INLINE static void hydro_write_flavour( ...@@ -212,6 +212,5 @@ __attribute__((always_inline)) INLINE static void hydro_write_flavour(
__attribute__((always_inline)) INLINE static int writeEntropyFlag(void) { __attribute__((always_inline)) INLINE static int writeEntropyFlag(void) {
return 0; return 0;
} }
>>>>>>> Check if all parameters in output_fields are correct
#endif /* SWIFT_GADGET2_HYDRO_IO_H */ #endif /* SWIFT_GADGET2_HYDRO_IO_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment