-
bow authored
Conflicts: public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/Gentrap.scala public/mapping/src/main/scala/nl/lumc/sasc/biopet/pipelines/mapping/Mapping.scala
d7fa4f90
Conflicts: public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/Gentrap.scala public/mapping/src/main/scala/nl/lumc/sasc/biopet/pipelines/mapping/Mapping.scala