From 36646ccfda2021bab7b1f42a6a1a101d7ac6df4d Mon Sep 17 00:00:00 2001
From: shichun-0415 <lishichun@pingcap.com>
Date: Thu, 24 Nov 2022 17:32:21 +0800
Subject: [PATCH] Update release-timeline.md

---
 releases/release-timeline.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/releases/release-timeline.md b/releases/release-timeline.md
index 6d8b1bcc5cf6..a33e6e36d014 100644
--- a/releases/release-timeline.md
+++ b/releases/release-timeline.md
@@ -9,11 +9,7 @@ summary: 了解 TiDB 的版本发布时间线。
 
 | 版本 | 发布日期 |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
 | [5.3.4](/releases/release-5.3.4.md) | 2022-11-24 |
-| [6.4.0-DMR](/releases/release-6.4.0.md) | 2022-11-17 |
->>>>>>> 8e82809ef (add 5.3.4 release notes (#12023))
 | [6.1.2](/releases/release-6.1.2.md) | 2022-10-24 |
 | [5.4.3](/releases/release-5.4.3.md) | 2022-10-13 |
 | [5.3.3](/releases/release-5.3.3.md) | 2022-09-14 |