fix errors

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MLInterfaces@90605 bc3139a8-67e5-0310-9ffc-ced21a209358
fix conflict

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MLInterfaces@93400 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge branch 'master' into remotes/hedgehog

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MLInterfaces@93404 bc3139a8-67e5-0310-9ffc-ced21a209358
nothing
Merge remote-tracking branch 'remotes/hedgehog'
fix DESCRIPTION