[ARVADOS] updated: c7539c212173e4ce103ec8cc893f0c4f0a942ba3

[Git user]

Summary of changes:
 sdk/cwl/tests/test_job.py | 4 ----
 1 file changed, 4 deletions(-)

       via  c7539c212173e4ce103ec8cc893f0c4f0a942ba3 (commit)
      from  d27d9df7bfb7be820b4674675a240901348cfadb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c7539c212173e4ce103ec8cc893f0c4f0a942ba3
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Mar 23 15:42:21 2016 -0400

    Fix merge conflict.  refs #8766

diff --git a/sdk/cwl/tests/test_job.py b/sdk/cwl/tests/test_job.py
index 4351b1a..ae48238 100644
--- a/sdk/cwl/tests/test_job.py
+++ b/sdk/cwl/tests/test_job.py
@@ -67,11 +67,7 @@ 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',

-----------------------------------------------------------------------


hooks/post-receive
--