One more conflict.
This commit is contained in:
parent
5962c0e9a3
commit
cfa59440c5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=128461
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user