Fix YAML

cockroachdb · Oct 17, 2024 · 8e9fe9a · 8e9fe9a
1 parent 9cb9a6d
commit 8e9fe9a
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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: