From 7fe45501b8d55e5d8466d803cc213c9c9baefdb2 Mon Sep 17 00:00:00 2001
From: Alexander Schlemmer <alexander.schlemmer@ds.mpg.de>
Date: Wed, 9 Jan 2019 17:20:39 +0100
Subject: [PATCH] FIX: corrected unresolved merge in makefile

---
 makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/makefile b/makefile
index a972dcbb..5bd27064 100644
--- a/makefile
+++ b/makefile
@@ -21,13 +21,11 @@
 # ** end header
 #
 
-<<<<<<< HEAD
+SHELL:=/bin/bash
+
 runserver:
 	mvn exec:exec
 
-=======
-SHELL:=/bin/bash
->>>>>>> 619a505b48586e03fd34f65da12d6ff1b32138c6
 run: compile
 	mvn exec:exec
 
-- 
GitLab