Update release-timeline.md

pingcap · Oct 13, 2022 · 662bf0d · 662bf0d
1 parent 4580064
commit 662bf0d
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/releases/release-timeline.md b/releases/release-timeline.md
@@ -9,11 +9,7 @@ This document shows all the released TiDB versions in reverse chronological orde
 
 | Version | Release Date |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
 | [5.4.3](/releases/release-5.4.3.md) | 2022-10-13 |
-| [6.3.0-DMR](/releases/release-6.3.0.md) | 2022-09-30 |
->>>>>>> e5c12babe (add v5.4.3 release notes (#10581))
 | [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 |
@@ -156,4 +152,4 @@ This document shows all the released TiDB versions in reverse chronological orde
 | [rc4](/releases/release-rc.4.md) | 2017-08-04 |
 | [rc3](/releases/release-rc.3.md) | 2017-06-16 |
 | [rc2](/releases/release-rc.2.md) | 2017-03-01 |
-| [rc1](/releases/release-rc.1.md) | 2016-12-23 |
+| [rc1](/releases/release-rc.1.md) | 2016-12-23 |