Skip to content
Snippets Groups Projects
Commit 81d7abd9 authored by Folkert Nobels's avatar Folkert Nobels
Browse files

Remove a few bugs

parent b16226db
No related branches found
No related tags found
1 merge request!705Star formation following Schaye08
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
src/runner.c
+ 0
− 4
View file @ 81d7abd9
...@@ -64,11 +64,7 @@ ...@@ -64,11 +64,7 @@
#include "task.h" #include "task.h"
#include "timers.h" #include "timers.h"
#include "timestep.h" #include "timestep.h"
<<<<<<< HEAD
#include "tracers.h"
=======
#include "starformation.h" #include "starformation.h"
>>>>>>> Remove a few bugs
#define TASK_LOOP_DENSITY 0 #define TASK_LOOP_DENSITY 0
#define TASK_LOOP_GRADIENT 1 #define TASK_LOOP_GRADIENT 1
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment