diff options
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 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; |
