Update releases/release-timeline.md

pingcap · Sep 20, 2024 · 5d971e9 · 5d971e9
1 parent b473a5e
commit 5d971e9
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/releases/release-timeline.md b/releases/release-timeline.md
@@ -11,14 +11,7 @@ summary: 了解 TiDB 的版本发布时间线。
 
 | 版本 | 发布日期 |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
 | [6.5.11](/releases/release-6.5.11.md) | 2024-09-20 |
-| [8.1.1](/releases/release-8.1.1.md) | 2024-08-27 |
-| [8.3.0-DMR](/releases/release-8.3.0.md) | 2024-08-22 |
-| [7.5.3](/releases/release-7.5.3.md) | 2024-08-05 |
-| [8.2.0-DMR](/releases/release-8.2.0.md) | 2024-07-11 |
->>>>>>> 5c72701a45 (add v6.5.11 release notes (#18599))
 | [6.5.10](/releases/release-6.5.10.md) | 2024-06-20 |
 | [7.1.5](/releases/release-7.1.5.md) | 2024-04-26 |
 | [6.5.9](/releases/release-6.5.9.md) | 2024-04-12 |