From bb8cecb424172880c85b4a1b9604d3ebf1f61405 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Fri, 29 Apr 2011 17:54:42 +0200
Subject: [PATCH] fix error caused by merging

---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 47ca6adf45..bc5e7fa1ba 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