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

Merge branch 'develop' into feature-unittest_core

Conflicts:
	public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunctionTrait.scala
	public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala
parents 978b8381 9e88effb
No related branches found
No related tags found
No related merge requests found
Showing
with 146 additions and 105 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