Merge resolution
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- .gitlab-ci.yml 21 additions, 16 deletions.gitlab-ci.yml
- CHANGELOG.md 0 additions, 2 deletionsCHANGELOG.md
- workflow/conf/aws_ondemand.config 16 additions, 1 deletionworkflow/conf/aws_ondemand.config
- workflow/conf/aws_spot.config 16 additions, 1 deletionworkflow/conf/aws_spot.config
- workflow/conf/biohpc.config 8 additions, 5 deletionsworkflow/conf/biohpc.config
- workflow/nextflow.config 6 additions, 3 deletionsworkflow/nextflow.config
- workflow/rna-seq.nf 114 additions, 73 deletionsworkflow/rna-seq.nf
- workflow/scripts/modifyFetch.py 0 additions, 25 deletionsworkflow/scripts/modifyFetch.py
- workflow/scripts/parseMeta.py 3 additions, 2 deletionsworkflow/scripts/parseMeta.py
- workflow/scripts/splitFetch.py 0 additions, 25 deletionsworkflow/scripts/splitFetch.py
- workflow/tests/test_alignReads.py 6 additions, 28 deletionsworkflow/tests/test_alignReads.py
- workflow/tests/test_dedupReads.py 2 additions, 21 deletionsworkflow/tests/test_dedupReads.py
- workflow/tests/test_trimData.py 4 additions, 3 deletionsworkflow/tests/test_trimData.py
Please register or sign in to comment