resolve conflicts

pingcap · Nov 14, 2023 · fb739a7 · fb739a7
1 parent 786693e
commit fb739a7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 18 deletions.
diff --git a/en/tidb-toolkit.md b/en/tidb-toolkit.md
@@ -199,20 +199,11 @@ helm search repo pingcap
 
 ```
 NAME                    CHART VERSION   APP VERSION     DESCRIPTION
-<<<<<<< HEAD
 pingcap/tidb-backup     v1.4.7                  A Helm chart for TiDB Backup or Restore
 pingcap/tidb-cluster    v1.4.7                  A Helm chart for TiDB Cluster
 pingcap/tidb-drainer    v1.4.7                  A Helm chart for TiDB Binlog drainer.
 pingcap/tidb-lightning  v1.4.7                  A Helm chart for TiDB Lightning
 pingcap/tidb-operator   v1.4.7  v1.4.7  tidb-operator Helm chart for Kubernetes
-pingcap/tikv-importer   v1.4.7                  A Helm chart for TiKV Importer
-=======
-pingcap/tidb-backup     v1.5.1                          A Helm chart for TiDB Backup or Restore
-pingcap/tidb-cluster    v1.5.1                          A Helm chart for TiDB Cluster
-pingcap/tidb-drainer    v1.5.1                          A Helm chart for TiDB Binlog drainer.
-pingcap/tidb-lightning  v1.5.1                          A Helm chart for TiDB Lightning
-pingcap/tidb-operator   v1.5.1          v1.5.1          tidb-operator Helm chart for Kubernetes
->>>>>>> 0eb7d041 (deprecated-tikv-importer-in-operator (#2461))
 ```
 
 When a new version of chart has been released, you can use `helm repo update` to update the repository cached locally:

diff --git a/zh/tidb-toolkit.md b/zh/tidb-toolkit.md
@@ -199,20 +199,11 @@ helm search repo pingcap
 
 ```
 NAME                    CHART VERSION   APP VERSION     DESCRIPTION
-<<<<<<< HEAD
 pingcap/tidb-backup     v1.4.7                          A Helm chart for TiDB Backup or Restore
 pingcap/tidb-cluster    v1.4.7                          A Helm chart for TiDB Cluster
 pingcap/tidb-drainer    v1.4.7                          A Helm chart for TiDB Binlog drainer.
 pingcap/tidb-lightning  v1.4.7                          A Helm chart for TiDB Lightning
 pingcap/tidb-operator   v1.4.7          v1.4.7          tidb-operator Helm chart for Kubernetes
-pingcap/tikv-importer   v1.4.7                          A Helm chart for TiKV Importer
-=======
-pingcap/tidb-backup     v1.5.1                          A Helm chart for TiDB Backup or Restore
-pingcap/tidb-cluster    v1.5.1                          A Helm chart for TiDB Cluster
-pingcap/tidb-drainer    v1.5.1                          A Helm chart for TiDB Binlog drainer.
-pingcap/tidb-lightning  v1.5.1                          A Helm chart for TiDB Lightning
-pingcap/tidb-operator   v1.5.1          v1.5.1          tidb-operator Helm chart for Kubernetes
->>>>>>> 0eb7d041 (deprecated-tikv-importer-in-operator (#2461))
 ```
 
 当新版本的 chart 发布后，你可以使用 `helm repo update` 命令更新本地对于仓库的缓存：