From d88e907086305fc05616896e7bf20f20de715298 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Apr 2013 08:18:19 +0200
Subject: [PATCH] merge from seeddms-4.1.2

---
 inc/inc.Version.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index ae56b84ef..f48ec783e 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,11 +20,7 @@
 
 class SeedDMS_Version {
 
-<<<<<<< HEAD
 	var $_number = "4.2.0";
-=======
-	var $_number = "4.1.2";
->>>>>>> seeddms-4.1.2
 	var $_string = "SeedDMS";
 
 	function SeedDMS_Version() {