From fa6062848af0294838edc35415d2b7f479553feb Mon Sep 17 00:00:00 2001
From: basney <basney>
Date: Wed, 30 Jul 2008 21:19:07 +0000
Subject: [PATCH] Oops, missed a conflict line.

---
 openssh/configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openssh/configure.ac b/openssh/configure.ac
index b16f186..422f199 100644
--- a/openssh/configure.ac
+++ b/openssh/configure.ac
@@ -1127,7 +1127,6 @@ int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));}
 	]
 )
 
-<<<<<<< configure.ac
 # Check whether the user wants GSSAPI mechglue support
 AC_ARG_WITH(mechglue,
 	[  --with-mechglue=PATH    Build with GSSAPI mechglue library],
-- 
2.45.1