merged changes

DataBiosphere · May 17, 2016 · 9a7de83 · 9a7de83
1 parent bee1b35
commit 9a7de83
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/toil/test/src/promisedRequirementTest.py b/src/toil/test/src/promisedRequirementTest.py
@@ -15,12 +15,7 @@
 from __future__ import absolute_import, print_function
 import os
 import logging
-<<<<<<< 4412050adf28b19c9cacd1247e3ff9339cc1d6be
 import toil.test.batchSystems.batchSystemTest as batchSystemTest
-=======
-import multiprocessing
-from toil.batchSystems.mesos.test import MesosTestSupport
->>>>>>> Thinkbox changes
 from toil.job import Job
 from toil.job import PromisedRequirement
 from toil.test import needs_mesos