From c4a8bc676118748885b4137a236c6ba53926f450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Mon, 8 Aug 2022 10:16:12 +0200
Subject: [PATCH] merge 11507

---
 core/core.php | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

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 .= '<p>' . $this->getData(['locale', 'cookies', 'mainLabel']) . '</p>';
 			// Formulaire de réponse
 			$item .= '<form method="POST" action="' . helper::baseUrl() . $this->getUrl() . '" id="cookieForm">';
-<<<<<<< HEAD
-=======
-			$analytics = $this->getData(['config', 'seo', 'analyticsId']);
-			$stateCookieGA = $this->getInput('ZWII_COOKIE_GA_CONSENT') ===  'true' ? 'checked="checked"' : '';
-			if( $analytics !== null AND $analytics !== '' ) {
-				$item .= '<p>' . $this->getData(['locale', 'cookies', 'gaLabel']) . '</p>';
-				$item .= '<input type="checkbox" id="googleAnalytics" name="googleAnalytics" value="GA" ' . $stateCookieGA . '>';
-				$item .= '<label for="googleAnalytics">' . $this->getData(['locale', 'cookies', 'checkboxGaLabel']) . '</label>';
-			}
->>>>>>> 11507
 			$item .= '<br><br>';
 			$item .= '<input type="submit" id="cookieConsentConfirm" value="' . $this->getData(['locale', 'cookies', 'buttonValidLabel']) . '">';
 			$item .= '</form>';