From 63c7055a9995ffb6218f0bdf6789226250d19adb Mon Sep 17 00:00:00 2001
From: yamlahik <k.yamlahi@techdivision.com>
Date: Thu, 11 Jul 2024 13:42:24 +0200
Subject: [PATCH] refactoring

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b347bb5..d73bb033 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Version 5.0.0 (coming soon)
 This is mostly a cleanup release offering stronger type guarantees for integrators with the changes, but there is no big new feature for end users.
 * The minimum supported PHP version is now 8.1.0.