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

remove merge detritus

This commit is contained in:
Daniel Stone 2006-09-27 16:15:27 +03:00 committed by Daniel Stone
parent ad321fad4b
commit a5d639cd87
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

@ -1507,7 +1507,6 @@ if test "$KDRIVE" = yes; then
fi fi
# tslib... # tslib...
<<<<<<< HEAD/configure.ac
AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"]) AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
if test "x$TSLIB" = xauto && test "x$HAVE_TSLIB" = xyes; then if test "x$TSLIB" = xauto && test "x$HAVE_TSLIB" = xyes; then
TSLIB=yes TSLIB=yes