mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 14:26:43 +00:00
fix error caused by merging
This commit is contained in:
parent
992e3f7c55
commit
bb8cecb424
1 changed files with 0 additions and 1 deletions
|
@ -54,7 +54,6 @@ AC_LIBTOOL_WIN32_DLL
|
||||||
AM_PROG_LIBTOOL
|
AM_PROG_LIBTOOL
|
||||||
|
|
||||||
dnl *** required versions of GStreamer stuff ***
|
dnl *** required versions of GStreamer stuff ***
|
||||||
<<<<<<< HEAD
|
|
||||||
GST_REQ=0.11.0
|
GST_REQ=0.11.0
|
||||||
GSTPB_REQ=0.11.0
|
GSTPB_REQ=0.11.0
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue