public/pom.xml · 2af2676b26df0358aca4a06da4bbaf7a10d9621a · Mirrors / biopet.biopet

10 years ago

Merge branch 'develop' into feature-bamToBigWig · d3b973b0

Peter van 't Hof authored 10 years ago

Conflicts:
	public/biopet-public-package/pom.xml
	public/biopet-public-package/src/main/scala/nl/lumc/sasc/biopet/core/BiopetExecutablePublic.scala
	public/pom.xml

d3b973b0

History

Merge branch 'develop' into feature-bamToBigWig

Peter van 't Hof authored 10 years ago

Conflicts:
	public/biopet-public-package/pom.xml
	public/biopet-public-package/src/main/scala/nl/lumc/sasc/biopet/core/BiopetExecutablePublic.scala
	public/pom.xml