From 7ed3d267e43283274fc3e3a5c5338b4904f57a54 Mon Sep 17 00:00:00 2001
From: Sascha Silbe <silbe@activitycentral.com>
Date: Sat, 28 May 2011 14:57:12 +0000
Subject: fix configure.ac breakage caused by Pootle

Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
---
diff --git a/configure.ac b/configure.ac
index 8ddbf84..49e6289 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-AC_INIT([sugar-base],[0.87.2],[],[sugar-base])
-=======
 AC_INIT([sugar-base],[0.92.0],[],[sugar-base])
->>>>>>> eb7ada51259747e39c064abb1eae9be7c01e71d3
 
 AC_PREREQ([2.59])
 
--
cgit v0.9.1