Skip to content
Snippets Groups Projects
Commit b9117b9d authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

Merge branch 'develop' into feature-shiva

Conflicts:
	public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/summary/WriteSummary.scala
	public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/samtools/SamtoolsMpileup.scala
parents 9451debe 7339ef7b
No related branches found
No related tags found
No related merge requests found
Showing
with 156 additions and 265 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment