fix error caused by merging

This commit is contained in:
Wim Taymans 2011-04-29 17:54:42 +02:00
parent 992e3f7c55
commit bb8cecb424

View file

@ -54,7 +54,6 @@ AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
dnl *** required versions of GStreamer stuff ***
<<<<<<< HEAD
GST_REQ=0.11.0
GSTPB_REQ=0.11.0