From 98deee1ef1d3c066359d8f72ce4428ef9f2dc060 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Thu, 29 Jul 2021 15:34:18 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #6761 Signed-off-by: ti-chi-bot --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 13b8ad1a50c4..06181ec0606f 100755 --- a/README.md +++ b/README.md @@ -13,6 +13,11 @@ | 文档仓库 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 稳定版 | From 97fb39c4e8c534f2943d0c7f925e75237f697491 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Thu, 29 Jul 2021 16:39:28 +0800 Subject: [PATCH 2/2] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 06181ec0606f..4d9af1611f82 100755 --- 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 稳定版 |