Update releases/release-timeline.md

pingcap · Feb 8, 2023 · 3e31536 · 3e31536
1 parent 7182ce6
commit 3e31536
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/releases/release-timeline.md b/releases/release-timeline.md
@@ -9,11 +9,7 @@ summary: 了解 TiDB 的版本发布时间线。
 
 | 版本 | 发布日期 |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
 | [6.1.4](/releases/release-6.1.4.md) | 2023-02-08 |
-| [6.5.0](/releases/release-6.5.0.md) | 2022-12-29 |
->>>>>>> 84cb78179 (add v6.1.4 release notes (#12816))
 | [5.1.5](/releases/release-5.1.5.md) | 2022-12-28 |
 | [6.1.3](/releases/release-6.1.3.md) | 2022-12-05 |
 | [5.3.4](/releases/release-5.3.4.md) | 2022-11-24 |