Changeset 263 for trunk/admin/versione.php

Timestamp:

Jun 7, 2017, 8:03:25 PM (7 years ago)

Author:

roby

Message:

correzioni alla revisione 259

File:

• trunk/admin/versione.php (modified) (1 diff)

trunk/admin/versione.php

@@ -1 +1 @@
 <?php
 
+<<<<<<< .mine
+$versione = "2.0 rev 263";
+=======
 $versione = "2.0 rev 262";
+>>>>>>> .r262
 $version_number = $versione;
+<<<<<<< .mine
+$version = "Eleonline $version_number (<i>Data Release: 7 giugno 2017</i>)";
+=======
 $version = "Eleonline $version_number (<i>Data Release: 31 maggio 2017</i>)";
+>>>>>>> .r262
 
 ?>