diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2006-11-10 16:52:41 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2006-11-10 16:52:41 +0000 |
| commit | 62efe23a828ce21ae4d100dc0fd5331f5582e7df (patch) | |
| tree | 538ffcf6acb6ece62b0734e0707ef5a1e8efbd7a /crypto/openssh/sshd_config.5 | |
| parent | b8e61582feacfd6acace15f1990fc0a5426d184e (diff) | |
| download | src-62efe23a828ce21ae4d100dc0fd5331f5582e7df.tar.gz src-62efe23a828ce21ae4d100dc0fd5331f5582e7df.zip | |
Resolve conflicts.
Notes
Notes:
svn path=/head/; revision=164149
Diffstat (limited to 'crypto/openssh/sshd_config.5')
| -rw-r--r-- | crypto/openssh/sshd_config.5 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5 index 097511430d8b..7741dca430c9 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -860,7 +860,7 @@ The default is Specifies a string to append to the regular version string to identify OS- or site-specific modifications. The default is -.Dq FreeBSD-20060930 . +.Dq FreeBSD-20061110 . .It Cm X11DisplayOffset Specifies the first display number available for .Xr sshd 8 Ns 's |