resolving conficts ottos-mops root/branches/BioVeL/ottos-mops
authorAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Wed, 25 Feb 2015 08:49:11 +0000 (08:49 +0000)
committerAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Wed, 25 Feb 2015 08:49:11 +0000 (08:49 +0000)
commit41cda3d49f3d7fe84af85d20882f2bec1baaf6b4
tree581ea970fff5aa8bc9071ec9003d6c9d338ab73e
parentc8874ccc868fec2ea7ab809dddee81d54514e65f
parentebd40ea899704e328ce1a551c0d8965048f1d505
resolving conficts
README.md