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