merge
This commit is contained in:
commit
ab58830fcb
1 changed files with 4 additions and 0 deletions
|
@ -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():
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue