d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

One more conflict.

Browse Source
This commit is contained in:
Dag-Erling Smørgrav 2004-04-20 09:47:13 +00:00
parent 5962c0e9a3
commit cfa59440c5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=128461
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/openssh/readconf.c
View File

@ -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;