merge

2017-07-12 18:21:55 +02:00 · 2017-07-12 18:21:55 +02:00 · ab58830fcb
parent 3ccbed4d3a 2a214b93bd
commit ab58830fcb
1 changed files with 4 additions and 0 deletions
--- a/src/main.py
+++ b/src/main.py
@ -3,6 +3,10 @@
 import sys
 import getopt
 from SchedulingAlgorithms import simanneal as sim
+<<<<<<< HEAD
+=======
+from Output import output as o
+>>>>>>> origin/devel


 def usage():