From 8d709f0280b458515b32c2b87938749428e5c149 Mon Sep 17 00:00:00 2001
From: "Zephaniah E. Hull" <warp@agamemnon.b5>
Date: Sun, 10 Sep 2006 15:48:35 -0400
Subject: [PATCH] Remove a merge artifact so that we can compile.

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

diff --git a/configure.ac b/configure.ac
index 8aa6a3424..047857af1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1504,7 +1504,6 @@ if test "$KDRIVE" = yes; then
     fi
     
     # tslib...
-<<<<<<< HEAD/configure.ac
     AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
     if test "x$TSLIB" = xauto && test "x$HAVE_TSLIB" = xyes; then
         TSLIB=yes