From 81d7abd9c06c00d5fcf55e5f8280fca34134f40a Mon Sep 17 00:00:00 2001
From: Folkert Nobels <nobels@strw.leidenuniv.nl>
Date: Thu, 6 Dec 2018 14:18:01 +0100
Subject: [PATCH] Remove a few bugs

---
 src/runner.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/runner.c b/src/runner.c
index 72b7e8d157..bd6919411d 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -64,11 +64,7 @@
 #include "task.h"
 #include "timers.h"
 #include "timestep.h"
-<<<<<<< HEAD
-#include "tracers.h"
-=======
 #include "starformation.h"
->>>>>>> Remove a few bugs
 
 #define TASK_LOOP_DENSITY 0
 #define TASK_LOOP_GRADIENT 1
-- 
GitLab