From 613adbb0c28685b8aec3689eafc4e14dd10cabda Mon Sep 17 00:00:00 2001
From: Michael E Brown <mebrown@michaels-house.net>
Date: Tue, 4 Dec 2007 00:38:47 -0600
Subject: merge conflicts.

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 2cc1b32..08a99ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_INIT([mock],[0.8.12])
 temp_RELEASE_NAME=mock
 temp_RELEASE_MAJOR=0
 temp_RELEASE_MINOR=8
-temp_RELEASE_SUBLEVEL=12
+temp_RELEASE_SUBLEVEL=13
 temp_RELEASE_EXTRALEVEL=
 
 ####################################
-- 
cgit