Commit fd51d77f authored by Jan Hoeckesfeld's avatar Jan Hoeckesfeld
Browse files

merge fix

parent b549611c
...@@ -82,11 +82,7 @@ rule calcLikelihoods: ...@@ -82,11 +82,7 @@ rule calcLikelihoods:
itersetType = config['itersetType'], itersetType = config['itersetType'],
#cluster exectuion #cluster exectuion
cpus = '8', cpus = '8',
<<<<<<< HEAD
mem = '10G',
=======
mem = '15G', mem = '15G',
>>>>>>> iterationset-tests
gpus = '0', gpus = '0',
walltime = '00:30:00' walltime = '00:30:00'
singularity: singularity:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment