From 52a2f0ca2f3af66db581c04b25317f46394eeddb Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Wed, 12 Jul 2017 20:06:18 +0200
Subject: [PATCH] fix remaining merge conflict artifacts

---
 src/main.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main.py b/src/main.py
index 02066ae..31c5c07 100644
--- a/src/main.py
+++ b/src/main.py
@@ -3,10 +3,7 @@
 import sys
 import getopt
 from SchedulingAlgorithms import simanneal as sim
-<<<<<<< HEAD
-=======
 from Output import output as o
->>>>>>> origin/devel
 
 
 def usage():