uhm, shouldn't have done that this is righter

Original commit message from CVS:
uhm, shouldn't have done that
this is righter

diff --git a/configure.ac b/configure.ac
index fa241ba..b26bb62 100644 (file)
--- 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)