Update releases/release-timeline.md

pingcap · Sep 14, 2022 · 275705f · 275705f
1 parent 211f320
commit 275705f
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/releases/release-timeline.md b/releases/release-timeline.md
@@ -9,12 +9,9 @@ This document shows all the released TiDB versions in reverse chronological orde
 
 | Version | Release Date |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
 | [5.3.3](/releases/release-5.3.3.md) | 2022-09-14 |
-| [6.1.1](/releases/release-6.1.1.md) | 2022-09-01 |
-| [6.2.0-DMR](/releases/release-6.2.0.md) | 2022-08-23 |
->>>>>>> 1935d74ad (release: add TiDB 5.3.3 release note (#10393))
+| [6.1.1](https://docs.pingcap.com/tidb/v6.1/release-6.1.1) | 2022-09-01 |
+| [6.2.0-DMR](https://docs.pingcap.com/tidb/v6.2/release-6.2.0) | 2022-08-23 |
 | [5.4.2](/releases/release-5.4.2.md) | 2022-07-08 |
 | [5.3.2](/releases/release-5.3.2.md) | 2022-06-29 |
 | [5.4.1](/releases/release-5.4.1.md) | 2022-05-13 |