From c13f01899ba9997d61c18ce75374d37f0fc8466b Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Tue, 28 Mar 2023 13:21:16 +0200
Subject: [PATCH] merge error

---
 core/core.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/core/core.php b/core/core.php
index 3a0d7e41..40212c18 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1306,9 +1306,4 @@ class common
 		}
 		$zip->close();
 	}
-<<<<<<<<< Temporary merge branch 1
-}
-=========
-}
->>>>>>>>> Temporary merge branch 2
-
+}
\ No newline at end of file