diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-09-27 16:15:27 +0300 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-09-27 16:15:27 +0300 |
| commit | a5d639cd87f30f9b3d765352d27253940f33b2b7 (patch) | |
| tree | 31ce4ce12b23e1359ee701ec0dae82289e671dfe /configure.ac | |
| parent | ad321fad4b9ab3a2c70cfff37ca6c8faaa5cce9c (diff) | |
remove merge detritus
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0a9fe5240..0397b5819 100644 --- a/configure.ac +++ b/configure.ac @@ -1507,7 +1507,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 |