summaryrefslogtreecommitdiff
path: root/rsync/tube.c
authorwaspe <waspe>2003-11-04 16:37:14 (UTC)
committer waspe <waspe>2003-11-04 16:37:14 (UTC)
commitefcd8d6a743261194b55df3afeec956fde9886d4 (patch) (side-by-side diff)
tree7bf7232a92c40c8236813fc06aac18b4f8d16d1d /rsync/tube.c
parentd2c52ff34d0ef37d055f74bb9fd957c6ffc583a9 (diff)
downloadopie-efcd8d6a743261194b55df3afeec956fde9886d4.zip
opie-efcd8d6a743261194b55df3afeec956fde9886d4.tar.gz
opie-efcd8d6a743261194b55df3afeec956fde9886d4.tar.bz2
remove merge conflict
Diffstat (limited to 'rsync/tube.c') (more/less context) (ignore whitespace changes)
0 files changed, 0 insertions, 0 deletions