From aecd7a9083a94c9150af299442eca8e5e83972f4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 17 Apr 2013 11:15:19 +0200
Subject: [PATCH] solved conflict with branch seeddms-4.1.3

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

diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index b3d600c09..c80d812bc 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php
 //    MyDMS. Document Management System
 //    Copyright (C) 2002-2005 Markus Westphal
@@ -33,39 +32,3 @@ class SeedDMS_Version {
 	}
 }
 ?>
-=======
-<?php
-//    MyDMS. Document Management System
-//    Copyright (C) 2002-2005 Markus Westphal
-//    Copyright (C) 2006-2008 Malcolm Cowe
-//    Copyright (C) 2010-2013 Uwe Steinmann
-//
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-class SeedDMS_Version {
-
-	var $_number = "4.1.3";
-	var $_string = "SeedDMS";
-
-	function SeedDMS_Version() {
-		return;
-	}
-
-	function banner() {
-		return $this->_string .", ". $this->_number;
-	}
-}
-?>
->>>>>>> seeddms-4.1.3