Skip to content

Commit ccc71ff

Browse files
author
Peter Amstutz
committed
Merge branch 'master' into shell-commands
Conflicts: draft-3/draft-3/revsort-job.json draft-3/draft-3/whale.txt
2 parents 92b1085 + fc899cf commit ccc71ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

39 files changed

+39
-59
lines changed

‎draft-3/draft-3/add-lines-wf.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/add-lines-wf.cwl
1+
../../draft-2/draft-2/add-lines-wf.cwl

‎draft-3/draft-3/binding-test.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/binding-test.cwl
1+
../../draft-2/draft-2/binding-test.cwl

‎draft-3/draft-3/bwa-mem-job.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/bwa-mem-job.json
1+
../../draft-2/draft-2/bwa-mem-job.json

‎draft-3/draft-3/cat-job.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat-job.json
1+
../../draft-2/draft-2/cat-job.json

‎draft-3/draft-3/cat-n-job.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat-n-job.json
1+
../../draft-2/draft-2/cat-n-job.json

‎draft-3/draft-3/cat1-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat1-tool.cwl
1+
../../draft-2/draft-2/cat1-tool.cwl

‎draft-3/draft-3/cat2-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat2-tool.cwl
1+
../../draft-2/draft-2/cat2-tool.cwl

‎draft-3/draft-3/cat3-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat3-tool.cwl
1+
../../draft-2/draft-2/cat3-tool.cwl

‎draft-3/draft-3/cat4-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat4-tool.cwl
1+
../../draft-2/draft-2/cat4-tool.cwl

‎draft-3/draft-3/cat5-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/cat5-tool.cwl
1+
../../draft-2/draft-2/cat5-tool.cwl

‎draft-3/draft-3/count-lines3-job.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/count-lines3-job.json
1+
../../draft-2/draft-2/count-lines3-job.json

‎draft-3/draft-3/count-lines4-job.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/count-lines4-job.json
1+
../../draft-2/draft-2/count-lines4-job.json

‎draft-3/draft-3/count-lines6-job.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/count-lines6-job.json
1+
../../draft-2/draft-2/count-lines6-job.json

‎draft-3/draft-3/echo-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/echo-tool.cwl
1+
../../draft-2/draft-2/echo-tool.cwl

‎draft-3/draft-3/empty.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/empty.json
1+
../../draft-2/draft-2/empty.json

‎draft-3/draft-3/env-job.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/env-job.json
1+
../../draft-2/draft-2/env-job.json

‎draft-3/draft-3/env-tool1.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/env-tool1.cwl
1+
../../draft-2/draft-2/env-tool1.cwl

‎draft-3/draft-3/env-tool2.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/env-tool2.cwl
1+
../../draft-2/draft-2/env-tool2.cwl

‎draft-3/draft-3/hello.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/hello.txt
1+
../../draft-2/draft-2/hello.txt

‎draft-3/draft-3/index.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/index.py
1+
../../draft-2/draft-2/index.py

‎draft-3/draft-3/node-engine.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/node-engine.cwl
1+
../../draft-2/draft-2/node-engine.cwl

‎draft-3/draft-3/number.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/number.txt
1+
../../draft-2/draft-2/number.txt

‎draft-3/draft-3/parseInt-job.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/parseInt-job.json
1+
../../draft-2/draft-2/parseInt-job.json

‎draft-3/draft-3/rename-job.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/rename-job.json
1+
../../draft-2/draft-2/rename-job.json

‎draft-3/draft-3/rename.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/rename.cwl
1+
../../draft-2/draft-2/rename.cwl

‎draft-3/draft-3/revsort-job.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎draft-3/draft-3/revsort-job.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../draft-2/draft-2/revsort-job.json

‎draft-3/draft-3/revtool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/revtool.cwl
1+
../../draft-2/draft-2/revtool.cwl

‎draft-3/draft-3/scatter-job1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/scatter-job1.json
1+
../../draft-2/draft-2/scatter-job1.json

‎draft-3/draft-3/scatter-job2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/scatter-job2.json
1+
../../draft-2/draft-2/scatter-job2.json

‎draft-3/draft-3/scatter-wf1.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/scatter-wf1.cwl
1+
../../draft-2/draft-2/scatter-wf1.cwl

‎draft-3/draft-3/scatter-wf2.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/scatter-wf2.cwl
1+
../../draft-2/draft-2/scatter-wf2.cwl

‎draft-3/draft-3/search-job.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/search-job.json
1+
../../draft-2/draft-2/search-job.json

‎draft-3/draft-3/search.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/search.py
1+
../../draft-2/draft-2/search.py

‎draft-3/draft-3/sorttool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/sorttool.cwl
1+
../../draft-2/draft-2/sorttool.cwl

‎draft-3/draft-3/tmap-job.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/tmap-job.json
1+
../../draft-2/draft-2/tmap-job.json

‎draft-3/draft-3/underscore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/underscore.js
1+
../../draft-2/draft-2/underscore.js

‎draft-3/draft-3/wc-job.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/wc-job.json
1+
../../draft-2/draft-2/wc-job.json

‎draft-3/draft-3/wc-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../draft-2/wc-tool.cwl
1+
../../draft-2/draft-2/wc-tool.cwl

‎draft-3/draft-3/whale.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎draft-3/draft-3/whale.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../draft-2/draft-2/whale.txt

0 commit comments

Comments
 (0)