PSSAI_Team/JobShopScheduling
2
0
Fork 1
Code Issues 2 Pull requests Releases Wiki Activity

fix remaining merge conflict artifacts

Browse source
This commit is contained in:
Trolli Schmittlauch 2017-07-12 20:06:18 +02:00
parent ab58830fcb
commit 52a2f0ca2f
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main.py
View file

@ -3,10 +3,7 @@
import sys import sys
import getopt import getopt
from SchedulingAlgorithms import simanneal as sim from SchedulingAlgorithms import simanneal as sim
<<<<<<< HEAD
=======
from Output import output as o from Output import output as o
>>>>>>> origin/devel
def usage(): def usage():