gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-11 20:21:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

solved conflict with branch seeddms-4.1.3

Browse Source
This commit is contained in:
Uwe Steinmann 2013-04-17 11:15:19 +02:00
parent a8f3c7be59
commit aecd7a9083
1 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
inc/inc.Version.php
View File

@ -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