Apply suggestions from code review

pingcap · Feb 2, 2024 · a578a58 · a578a58
1 parent bc176da
commit a578a58
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 @@ This document shows all the released TiDB versions in reverse chronological orde
 
 | Version | Release Date |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
 | [6.5.8](/releases/release-6.5.8.md) | 2024-02-02 |
-| [7.6.0-DMR](/releases/release-7.6.0.md) | 2024-01-25 |
->>>>>>> a542615873 (add release note for v6.5.8 (#16367))
 | [6.5.7](/releases/release-6.5.7.md) | 2024-01-08 |
 | [7.1.3](/releases/release-7.1.3.md) | 2023-12-21 |
 | [6.5.6](/releases/release-6.5.6.md) | 2023-12-07 |