diff options
| author | ru <ru@FreeBSD.org> | 2001-05-14 18:13:34 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2001-05-14 18:13:34 +0000 |
| commit | 3add9296c0d3caf32b9bd8d7a1a36829df415713 (patch) | |
| tree | cd4d620041e48ccfcb975bfedde1d66203d16cbd /crypto | |
| parent | 767c484a85baf9e713b2057988eea646974dc7e9 (diff) | |
| download | FreeBSD-src-3add9296c0d3caf32b9bd8d7a1a36829df415713.zip FreeBSD-src-3add9296c0d3caf32b9bd8d7a1a36829df415713.tar.gz | |
mdoc(7) police: finished fixing conflicts in revision 1.18.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/openssh/ssh.1 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1 index 025e681..f2b74ea 100644 --- a/crypto/openssh/ssh.1 +++ b/crypto/openssh/ssh.1 @@ -810,7 +810,6 @@ real host name when looking up or saving the host key in the host key database files. This option is useful for tunneling ssh connections or if you have multiple servers running on a single host. ->>>>>>> 1.1.1.7 .It Cm HostName Specifies the real host name to log into. This can be used to specify nicknames or abbreviations for hosts. |
