From fcb07258927ab4606cda23dd41b337707f5eaa6d Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Fri, 15 Mar 2002 22:17:20 +0000
Subject: [PATCH] uhm, shouldn't have done that this is righter

Original commit message from CVS:
uhm, shouldn't have done that
this is righter
---
 configure.ac | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index fa241ba..b26bb62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,7 @@ AC_INIT
 AC_CANONICAL_TARGET([])
 
 dnl when going to/from release please set the nano (fourth number) right !
-<<<<<<< configure.ac
-AS_VERSION(gstreamer, GST_VERSION, 0, 3, 2, )
-=======
 AS_VERSION(gstreamer, GST_VERSION, 0, 3, 3, 1)
->>>>>>> 1.138
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
 AS_LIBTOOL(GST, 0, 0, 0, yes)
 
-- 
2.7.4