diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-04-20 09:47:13 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-04-20 09:47:13 +0000 |
| commit | cfa59440c5f20838427cab4e7ebe00a00b030a13 (patch) | |
| tree | 9e2742312d693ce54ffc59361c69c481790343d5 /crypto/openssh/readconf.c | |
| parent | 5962c0e9a3a89f39087a04044502f9b3a66676e6 (diff) | |
| download | src-cfa59440c5f20838427cab4e7ebe00a00b030a13.tar.gz src-cfa59440c5f20838427cab4e7ebe00a00b030a13.zip | |
One more conflict.
Notes
Notes:
svn path=/head/; revision=128461
Diffstat (limited to 'crypto/openssh/readconf.c')
| -rw-r--r-- | crypto/openssh/readconf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 9cc6ce7d0aac..c62b9432b295 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -106,12 +106,8 @@ typedef enum { oClearAllForwardings, oNoHostAuthenticationForLocalhost, oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, oAddressFamily, oGssAuthentication, oGssDelegateCreds, -<<<<<<< readconf.c - oServerAliveInterval, oServerAliveCountMax, - oVersionAddendum, -======= oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, ->>>>>>> 1.1.1.15 + oVersionAddendum, oDeprecated, oUnsupported } OpCodes; |