resolves conflict


git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/RpacksTesting/marctest@80602 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge branch 'local-hedgehog'