biopet-framework/BiopetFramework.iml · 335bf049f72d9d4e93ddb0aa99627ec0bc4d7e98 · Mirrors / biopet.biopet

10 years ago

Merge branch 'develop' into feature-extract_aligned_fastq · 6916ee36

bow authored 10 years ago

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

6916ee36

History

Merge branch 'develop' into feature-extract_aligned_fastq

bow authored 10 years ago

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