diff --git a/core/core.php b/core/core.php index be31d194..bba6fd53 100644 --- a/core/core.php +++ b/core/core.php @@ -46,13 +46,9 @@ class common { // Numéro de version const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/'; -<<<<<<< HEAD + const ZWII_VERSION = '12.0.00-dev'; const ZWII_UPDATE_CHANNEL = "test"; -======= - const ZWII_VERSION = '11.5.07'; - const ZWII_UPDATE_CHANNEL = "v11"; ->>>>>>> 11507 public static $actions = []; public static $coreModuleIds = [ @@ -1236,16 +1232,6 @@ class common { $item .= '
' . $this->getData(['locale', 'cookies', 'mainLabel']) . '
'; // Formulaire de réponse $item .= '';