From 1020947f9ca719068ab71cea214614c48c5d40f8 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 20 Jan 2025 13:51:21 -0500
Subject: [PATCH] chore: remove dangling git merge issue from changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4c0133c6c..62f7c005fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,6 @@
 6.13.6 / 2025-01-13
 ===================
  * fix: disallow nested $where in populate match CVE-2025-23061
-<<<<<<< HEAD
 
 8.9.4 / 2025-01-09
 ==================