Update README.md

pingcap · Jul 29, 2021 · 3e1fa90 · 3e1fa90
1 parent 2f86b69
commit 3e1fa90
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -13,11 +13,8 @@
 | 文档仓库 branch | 对应 TiDB 文档版本 |
 |:---------|:----------|
 | [`master`](https://github.com/pingcap/docs-cn/tree/master) | dev 最新开发版 |
-<<<<<<< HEAD
-=======
 | [`release-5.1`](https://github.com/pingcap/docs-cn/tree/release-5.1) | 5.1 稳定版 |
 | [`release-5.0`](https://github.com/pingcap/docs-cn/tree/release-5.0) | 5.0 稳定版 |
->>>>>>> 574f409dd (Add v5.1.0 / release-5.1 where it is missing (#6761))
 | [`release-4.0`](https://github.com/pingcap/docs-cn/tree/release-4.0) | 4.0 稳定版 |
 | [`release-3.1`](https://github.com/pingcap/docs-cn/tree/release-3.1) | 3.1 稳定版 |
 | [`release-3.0`](https://github.com/pingcap/docs-cn/tree/release-3.0) | 3.0 稳定版 |