Commit made by the Bioconductor Git-SVN bridge.
Consists of 1 commit(s).

Commit information:

    Commit id: bfc22e63999933f960dd8fe687460664a3d52911
    Commit message:
    resolve the svn and git conflicts by manuall remove 3 files
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-04-22T10:22:32-07:00

From: Bioconductor Git-SVN Bridge <bioc-sync@bioconductor.org>

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowCore@89340 bc3139a8-67e5-0310-9ffc-ced21a209358