-
Peter van 't Hof authored
Conflicts: pom.xml protected/biopet-gatk-extensions/pom.xml protected/biopet-gatk-pipelines/pom.xml protected/biopet-protected-package/pom.xml protected/pom.xml public/bam2wig/pom.xml public/bammetrics/pom.xml public/basty/pom.xml public/biopet-framework/pom.xml public/biopet-public-package/pom.xml public/carp/pom.xml public/flexiprep/pom.xml public/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Flexiprep.scala public/gentrap/pom.xml public/kopisu/pom.xml public/mapping/pom.xml public/pom.xml public/sage/pom.xml public/shiva/pom.xml public/toucan/pom.xml public/yamsvp/pom.xml
9a37f7d6