a change in svn branch of git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/bioC/Projects/bioc-sync-test@77172 bc3139a8-67e5-0310-9ffc-ced21a209358
small change

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/bioC/Projects/bioc-sync-test@77179 bc3139a8-67e5-0310-9ffc-ced21a209358
committing file with conflict markers in svn branch of git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/bioC/Projects/bioc-sync-test@77180 bc3139a8-67e5-0310-9ffc-ced21a209358