diff options
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 0f90e27a..718e39a3 100644 --- a/configure.ac +++ b/configure.ac @@ -569,7 +569,6 @@ if test "x$enable_converter" != "xno" ; then fi fi -<<<<<<< HEAD if test "x$enable_medialib" != "xno" ; then HAVE_MEDIALIB=yes fi |