diff options
| author | des <des@FreeBSD.org> | 2006-11-10 16:52:41 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-11-10 16:52:41 +0000 |
| commit | f486315183c122f23f1b35b42ac8dd3c2b635caa (patch) | |
| tree | 538ffcf6acb6ece62b0734e0707ef5a1e8efbd7a /crypto/openssh/ssh_config.5 | |
| parent | 11e3a8c8c1e6142fc51e7fc357907b54bd433aa7 (diff) | |
| download | FreeBSD-src-f486315183c122f23f1b35b42ac8dd3c2b635caa.zip FreeBSD-src-f486315183c122f23f1b35b42ac8dd3c2b635caa.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/ssh_config.5')
| -rw-r--r-- | crypto/openssh/ssh_config.5 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5 index 6a66cd7..c648cdf 100644 --- a/crypto/openssh/ssh_config.5 +++ b/crypto/openssh/ssh_config.5 @@ -1040,7 +1040,7 @@ in 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 XAuthLocation Specifies the full pathname of the .Xr xauth 1 |
