Update releases/release-timeline.md

pingcap · Jun 13, 2024 · ebdbdc8 · ebdbdc8
1 parent fd4dba1
commit ebdbdc8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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 |