From 8e9fe9a4d733c425268fa39c81de9daa87f5432a Mon Sep 17 00:00:00 2001
From: Matt Linville <linville@cockroachlabs.com>
Date: Thu, 17 Oct 2024 14:36:58 -0700
Subject: [PATCH] Fix YAML

---
 src/current/_data/releases.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/current/_data/releases.yml b/src/current/_data/releases.yml
index 077a8423430..95f3bbdc179 100644
--- a/src/current/_data/releases.yml
+++ b/src/current/_data/releases.yml
@@ -6916,7 +6916,6 @@
   source: true
   previous_release: v24.3.0-alpha.1
 
-<<<<<<< HEAD
 - release_name: v24.1.6
   major_version: v24.1
   release_date: '2024-10-17'
@@ -6957,7 +6956,6 @@
   release_type: Production
   go_version: go1.22.5
   sha: f00c152761838e05049d293198840b12605b545b
->>>>>>> 48614469b ([REL-1405] Release notes for v23.2.13)
   has_sql_only: true
   has_sha256sum: true
   mac: