move to 1.3c

svn:r379
rosslagerwall · Jul 31, 2007 · 87aad0e · 87aad0e
1 parent e5bba12
commit 87aad0e
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/configure.in b/configure.in
@@ -1,11 +1,7 @@
 dnl configure.in for libevent
 AC_INIT(event.c)
 
-<<<<<<< .mine
-AM_INIT_AUTOMAKE(libevent,1.3b)
-=======
-AM_INIT_AUTOMAKE(libevent,1.3a)
->>>>>>> .r345
+AM_INIT_AUTOMAKE(libevent,1.3c)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE