From b9a2647c5477dc6e7d9a7509f1062bcc14641ca9 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Sat, 24 Nov 2018 17:25:40 -0700
Subject: [PATCH] src/configure.ac: typo from merge conflict

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

diff --git a/src/configure.ac b/src/configure.ac
index 20377a7a4..1f62e6c2c 100644
--- 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])
-- 
2.25.1