From 6e7fa35a0a238ccf98f0f7958057952d9e467901 Mon Sep 17 00:00:00 2001 From: des Date: Tue, 20 Apr 2004 09:47:13 +0000 Subject: One more conflict. --- crypto/openssh/readconf.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'crypto/openssh') diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 9cc6ce7..c62b943 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; -- cgit v1.1