From cfa59440c5f20838427cab4e7ebe00a00b030a13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Tue, 20 Apr 2004 09:47:13 +0000
Subject: [PATCH] One more conflict.

---
 crypto/openssh/readconf.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c
index 9cc6ce7d0aa..c62b9432b29 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;