fix dangling merge conflict in changelog

Automattic · Dec 18, 2024 · 3b594a6 · 3b594a6
1 parent 6375e66
commit 3b594a6
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 8.9.1 / 2024-12-16
 ==================
  * fix(connection): remove heartbeat check in load balanced mode #15089 #15042 #14812