From e01a1a62e163da049d34828c3b36e14da86975c9 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Mon, 7 Feb 2022 14:03:22 +0100
Subject: [PATCH] update

---
 core/include/update.inc.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/include/update.inc.php b/core/include/update.inc.php
index 08d6e7c6..748032b8 100644
--- a/core/include/update.inc.php
+++ b/core/include/update.inc.php
@@ -788,7 +788,6 @@ if ($this->getData(['core', 'dataVersion']) < 11203) {
 
 	// Mise à jour
 	$this->setData(['core', 'dataVersion', 11203]);
-<<<<<<< HEAD
 }
 // Version 11.3.00
 if ($this->getData(['core', 'dataVersion']) < 11300) {
@@ -839,6 +838,4 @@ if ($this->getData(['core', 'dataVersion']) < 11300) {
 
 	// Mise à jour
 	$this->setData(['core', 'dataVersion', 11300]);
-=======
->>>>>>> 957121d76ec1c3c2f545d39f4228d501487904af
 }
\ No newline at end of file