Update releases/release-timeline.md

pingcap · Jun 29, 2022 · 4c91bfa · 4c91bfa
1 parent 88a5be6
commit 4c91bfa
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/releases/release-timeline.md b/releases/release-timeline.md
@@ -9,11 +9,8 @@ summary: 了解 TiDB 的版本发布时间线。
 
 | 版本 | 发布日期 |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
-| [5.3.2](/releases/release-5.3.2.md) | 2022-06-xx |
+| [5.3.2](/releases/release-5.3.2.md) | 2022-06-29 |
 | [6.1.0](/releases/release-6.1.0.md) | 2022-06-13 |
->>>>>>> 49ab9310f (releases: add v5.3.2 release notes (#9914))
 | [5.4.1](/releases/release-5.4.1.md) | 2022-05-13 |
 | [5.2.4](/releases/release-5.2.4.md) | 2022-04-26 |
 | [6.0.0-DMR](/releases/release-6.0.0-dmr.md) | 2022-04-07 |