Apply suggestions from code review

pingcap · Dec 26, 2024 · ed89515 · ed89515
1 parent 286d182
commit ed89515
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/releases/release-timeline.md b/releases/release-timeline.md
@@ -11,11 +11,7 @@ This document shows all the released TiDB versions in reverse chronological orde
 
 | Version | Release Date |
 | :--- | :--- |
-<<<<<<< HEAD
-=======
 | [8.1.2](/releases/release-8.1.2.md) | 2024-12-26 |
-| [8.5.0](/releases/release-8.5.0.md) | 2024-12-19 |
->>>>>>> 760fdacfda (add release notes for v8.1.2 (#19720))
 | [7.1.6](/releases/release-7.1.6.md) | 2024-11-21 |
 | [7.5.4](/releases/release-7.5.4.md) | 2024-10-15 |
 | [6.5.11](/releases/release-6.5.11.md) | 2024-09-20 |