From 81e6d94bb5fc03e98fd8e1100f1294ef791885f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Fri, 12 Mar 2010 08:23:46 +0000
Subject: [PATCH] configure: Fix merge mistake

---
 configure.ac | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 239356236e..a948caa24d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1641,11 +1641,8 @@ gst/frei0r/Makefile
 gst/h264parse/Makefile
 gst/hdvparse/Makefile
 gst/id3tag/Makefile
-<<<<<<< HEAD
 gst/invtelecine/Makefile
-=======
 gst/imagefreeze/Makefile
->>>>>>> imagefreeze: Add still frame stream generator element
 gst/jpegformat/Makefile
 gst/legacyresample/Makefile
 gst/librfb/Makefile