Update releases/release-timeline.md

pingcap · Jun 29, 2022 · 94d609a · 94d609a
1 parent d663fe2
commit 94d609a
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/releases/release-timeline.md b/releases/release-timeline.md
@@ -9,12 +9,7 @@ This document shows all the released TiDB versions in reverse chronological orde
 
 | Version | Release Date |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
-| [5.3.2](/releases/release-5.3.2.md) | 2022-06-xx |
-| [6.1.0](/releases/release-6.1.0.md) | 2022-06-13 |
-| [5.4.1](/releases/release-5.4.1.md) | 2022-05-13 |
->>>>>>> d0374b707 (releases: add tidb 5.3.2 release notes (#9029))
+| [5.3.2](/releases/release-5.3.2.md) | 2022-06-29 |
 | [5.2.4](/releases/release-5.2.4.md) | 2022-04-26 |
 | [5.3.1](/releases/release-5.3.1.md) | 2022-03-03 |
 | [5.1.4](/releases/release-5.1.4.md) | 2022-02-22 |