summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-01-04 07:27:50 +1100
committerDamien Miller <djm@mindrot.org>2006-01-04 07:27:50 +1100
commita969437645550a8f7595ba017c7658c4341d77d1 (patch)
tree0e4dbb41d6d60114019bf4bc08b8d8803ffcc097 /ssh.1
parentb797770da28c07a10b51528f79af3bacae2ff613 (diff)
- (djm) [channels.c] clean up harmless merge error, from reyk@
Diffstat (limited to 'ssh.1')
0 files changed, 0 insertions, 0 deletions