diff options
| author | des <des@FreeBSD.org> | 2003-04-23 17:13:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-04-23 17:13:13 +0000 |
| commit | 58b9db3b6f971290d3f183595398923fba625338 (patch) | |
| tree | fbb17bcf9ee0d969274a32106e1f15ae9a690fa3 /crypto/openssh/ssh_config | |
| parent | 6d34992e86f885f08b7df6e18a0b6af25ec2d664 (diff) | |
| download | FreeBSD-src-58b9db3b6f971290d3f183595398923fba625338.zip FreeBSD-src-58b9db3b6f971290d3f183595398923fba625338.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/ssh_config')
| -rw-r--r-- | crypto/openssh/ssh_config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index 7f32bd9..f768162 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -35,4 +35,4 @@ # Cipher 3des # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc # EscapeChar ~ -# VersionAddendum FreeBSD-20030201 +# VersionAddendum FreeBSD-20030423 |
