frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove a merge artifact so that we can compile.

This commit is contained in:
Zephaniah E. Hull 2006-09-10 15:48:35 -04:00
parent 60db190ecf
commit 8d709f0280
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -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