From 1e9c2e68b118aad13d7e6981b70c489d6ebc871a Mon Sep 17 00:00:00 2001
From: Aolin <aolin.zhang@pingcap.com>
Date: Wed, 12 Jul 2023 12:30:16 +0800
Subject: [PATCH] Apply suggestions from code review

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

diff --git a/releases/release-timeline.md b/releases/release-timeline.md
index f3deffe860324..c904b2e2d5f0c 100644
--- a/releases/release-timeline.md
+++ b/releases/release-timeline.md
@@ -9,11 +9,7 @@ This document shows all the released TiDB versions in reverse chronological orde
 
 | Version | Release Date |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
 | [6.1.7](/releases/release-6.1.7.md) | 2023-07-12 |
-| [7.2.0-DMR](/releases/release-7.2.0.md) | 2023-06-29 |
->>>>>>> 07c45bc3c (release: add v6.1.7 release notes (#14151))
 | [6.5.3](/releases/release-6.5.3.md) | 2023-06-14 |
 | [6.5.2](/releases/release-6.5.2.md) | 2023-04-21 |
 | [6.1.6](/releases/release-6.1.6.md) | 2023-04-12 |