Merge branch 'master' into 8766-cwl-collection-project

[arvados.git] / sdk / cwl / tests / test_job.py

diff --git a/sdk/cwl/tests/test_job.py b/sdk/cwl/tests/test_job.py
index ae482387459d6b63cd81253c00cfab76ed99a640..4351b1abfef5f9a7c24c8d6649c3b54ab88c3287 100644 (file)
--- a/sdk/cwl/tests/test_job.py
+++ b/sdk/cwl/tests/test_job.py
@@ -67,7 +67,11 @@ class TestJob(unittest.TestCase):
                     'task.env': {'TMPDIR': '$(task.tmpdir)'},
                     'command': ['ls']
                 }],
+<<<<<<< HEAD
                 'crunchrunner': arvados_cwl.crunchrunner_pdh + '/crunchrunner'
+=======
+                'crunchrunner': 'ff6fc71e593081ef9733afacaeee15ea+140/crunchrunner'
+>>>>>>> master
             },
             'script_version': 'master',
             'minimum_script_version': '9e5b98e8f5f4727856b53447191f9c06e3da2ba6',