Skip to content
Snippets Groups Projects
Commit 6916ee36 authored by bow's avatar bow
Browse files

Merge branch 'develop' into feature-extract_aligned_fastq 

Conflicts:
	biopet-framework/BiopetFramework.iml
	biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetExecutable.scala
	biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/BedToInterval.scala
	biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/WipeReads.scala
parents f8661a3d 3a0b6423
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 586 additions and 431 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