mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-06-18 02:59:27 +00:00
merge from seeddms-4.1.2
This commit is contained in:
parent
26798d7676
commit
d88e907086
|
@ -20,11 +20,7 @@
|
||||||
|
|
||||||
class SeedDMS_Version {
|
class SeedDMS_Version {
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
var $_number = "4.2.0";
|
var $_number = "4.2.0";
|
||||||
=======
|
|
||||||
var $_number = "4.1.2";
|
|
||||||
>>>>>>> seeddms-4.1.2
|
|
||||||
var $_string = "SeedDMS";
|
var $_string = "SeedDMS";
|
||||||
|
|
||||||
function SeedDMS_Version() {
|
function SeedDMS_Version() {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user