One more conflict.

2004-04-20 09:47:13 +00:00 · 2004-04-20 09:47:13 +00:00 · cfa59440c5
commit cfa59440c5
parent 5962c0e9a3
1 changed files with 1 additions and 5 deletions
--- 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;