Update releases/release-timeline.md

pingcap · Apr 12, 2023 · 5eb93bf · 5eb93bf
1 parent a0ea248
commit 5eb93bf
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/releases/release-timeline.md b/releases/release-timeline.md
@@ -9,11 +9,7 @@ summary: 了解 TiDB 的版本发布时间线。
 
 | 版本 | 发布日期 |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
 | [6.1.6](/releases/release-6.1.6.md) | 2023-04-12 |
-| [7.0.0-DMR](/releases/release-7.0.0.md) | 2023-03-30 |
->>>>>>> 27604d6d3 (release: add 6.1.6 release notes (#13577))
 | [6.5.1](/releases/release-6.5.1.md) | 2023-03-10 |
 | [6.1.5](/releases/release-6.1.5.md) | 2023-02-28 |
 | [6.1.4](/releases/release-6.1.4.md) | 2023-02-08 |