fix remaining merge conflict artifacts

2017-07-12 20:06:18 +02:00 · 2017-07-12 20:06:18 +02:00 · 52a2f0ca2f
parent ab58830fcb
commit 52a2f0ca2f
1 changed files with 0 additions and 3 deletions
--- 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():