From bfea21fe397cc5c2094eba6e0b915551375b66f8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 20 Dec 2024 15:07:34 +0530
Subject: [PATCH] ...

---
 docs/changelog.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 73624b253..e6f326403 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -84,7 +84,6 @@ consumption to do the same tasks.
 Detailed list of changes
 -------------------------------------
 
-<<<<<<< HEAD
 0.38.1 [future]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~