From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Fri, 29 Apr 2011 15:54:42 +0000 (+0200)
Subject: fix error caused by merging
X-Git-Tag: RELEASE-0.11.1~599
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb8cecb424172880c85b4a1b9604d3ebf1f61405;p=platform%2Fupstream%2Fgst-plugins-good.git

fix error caused by merging
---

diff --git a/configure.ac b/configure.ac
index 47ca6ad..bc5e7fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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