Skip to content
Snippets Groups Projects
Commit 526c6d93 authored by bow's avatar bow
Browse files

Merge remote-tracking branch 'upstream/peter' 

Conflicts:
	biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Seqtk.scala
	biopet-framework/src/main/scala/nl/lumc/sasc/biopet/function/Seqtk.scala
	biopet-framework/src/main/scala/nl/lumc/sasc/biopet/function/seqtk/SeqtkSeq.scala
	flexiprep/src/main/scala/nl/lumc/sasc/biopet/extensions/fastq/Fastqc.scala
	flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Flexiprep.scala
	flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/scripts/Seqstat.scala
parents 85e3f91d 397a0a5d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 54 additions and 20 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment