fix conflict

diff --git a/configure.ac b/configure.ac
index 2513751cf2eaad8cdf02b735f935af3535bb7ed3..1507bfd6fb03dac3e41b3a32a40c1a2f675dc015 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,13 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=133
+EXTRA_VERSION=132
 EXTRA_RELEASE=
-<<<<<<< configure.ac
-EXTRA_GTK2_VERSION=.0
-=======
-EXTRA_GTK2_VERSION=.0
->>>>>>> 1.654.2.239
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}