Update releases/release-timeline.md

pingcap · Feb 28, 2023 · a0d1b90 · a0d1b90
1 parent 658c58a
commit a0d1b90
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
-| [6.6.0-DMR](/releases/release-6.6.0.md) | 2023-02-20 |
-=======
 | [6.1.5](/releases/release-6.1.5.md) | 2023-02-28 |
->>>>>>> 7ffa20ebd (add v6.1.5 release notes (#13130))
+| [6.6.0-DMR](/releases/release-6.6.0.md) | 2023-02-20 |
 | [6.1.4](/releases/release-6.1.4.md) | 2023-02-08 |
 | [6.5.0](/releases/release-6.5.0.md) | 2022-12-29 |
 | [5.1.5](/releases/release-5.1.5.md) | 2022-12-28 |