Oops, missed a conflict line.

diff --git a/openssh/configure.ac b/openssh/configure.ac
index b16f1861ae004a9732e1ee13417f0ef9e4d53925..422f199a9ba889c5bd2ad9042481bd93f83febab 100644 (file)
--- 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],