Update releases/release-timeline.md

pingcap · Aug 27, 2024 · 2a01a7b · 2a01a7b
1 parent 033d0ea
commit 2a01a7b
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.1](/releases/release-8.1.1.md) | 2024-08-27 |
-| [8.3.0-DMR](/releases/release-8.3.0.md) | 2024-08-22 |
->>>>>>> 2cb0adce32 (add v8.1.1 release notes (#18537))
 | [7.5.3](/releases/release-7.5.3.md) | 2024-08-05 |
 | [8.2.0-DMR](/releases/release-8.2.0.md) | 2024-07-11 |
 | [6.5.10](/releases/release-6.5.10.md) | 2024-06-20 |