src/configure.ac: typo from merge conflict

diff --git a/src/configure.ac b/src/configure.ac
index 20377a7a4938311f11c77687f5d3146a4667a2cc..1f62e6c2c481351f4db8d0f1663ae1227f832596 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -366,7 +366,6 @@ if test x"${enable_x11_screen}" = xyes; then
 else
     IF_X11_SCREEN="#!x11-screen: "
     AC_MSG_RESULT([no])
->>>>>>> aafa6ac04e1b39110227242465d9dc1b8ef2e85b
 fi
 
 AC_SUBST([ALL_TARGET])