From ebdbdc8bd945a053489a43be478b3342df71c311 Mon Sep 17 00:00:00 2001
From: xixirangrang <hfxsd@hotmail.com>
Date: Thu, 13 Jun 2024 14:23:48 +0800
Subject: [PATCH] Update releases/release-timeline.md

---
 releases/release-timeline.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/releases/release-timeline.md b/releases/release-timeline.md
index 4ed731c6e41f8..6a7db568c6bf9 100644
--- a/releases/release-timeline.md
+++ b/releases/release-timeline.md
@@ -11,11 +11,7 @@ This document shows all the released TiDB versions in reverse chronological orde
 
 | Version | Release Date |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
 | [7.5.2](/releases/release-7.5.2.md) | 2024-06-13 |
-| [8.1.0](/releases/release-8.1.0.md) | 2024-05-24 |
->>>>>>> 64c65063ec (add release notes for 7.5.2 (#17701))
 | [7.1.5](/releases/release-7.1.5.md) | 2024-04-26 |
 | [6.5.9](/releases/release-6.5.9.md) | 2024-04-12 |
 | [7.1.4](/releases/release-7.1.4.md) | 2024-03-11 |