Update TOC.md

pingcap · Sep 27, 2021 · 155bfe4 · 155bfe4
1 parent 715ba7a
commit 155bfe4
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/TOC.md b/TOC.md
@@ -538,15 +538,6 @@
 + [Glossary](/glossary.md)
 + Release Notes
   + [All Releases](/releases/release-notes.md)
-<<<<<<< HEAD
-=======
-  + v5.2
-    + [5.2.1](/releases/release-5.2.1.md)
-    + [5.2.0](/releases/release-5.2.0.md)
-  + v5.1
-    + [5.1.1](/releases/release-5.1.1.md)
-    + [5.1.0](/releases/release-5.1.0.md)
->>>>>>> 0490cd195 (releases: add tidb 4.0.15 release notes (#6475))
   + v5.0
     + [5.0.3](/releases/release-5.0.3.md)
     + [5.0.2](/releases/release-5.0.2.md)