Apply suggestions from code review

pingcap · Aug 12, 2021 · 3f64a14 · 3f64a14
1 parent 16e38ec
commit 3f64a14
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/upgrade-tidb-using-tiup.md b/upgrade-tidb-using-tiup.md
@@ -99,11 +99,7 @@ tiup update cluster
     tiup cluster import -d /home/tidb/tidb-ansible
     ```
 
-<<<<<<< HEAD
 2. 执行导入命令后，若集群 `Inventory` 信息解析成功，将出现如下提示：
-=======
-2. 参考 [topology](https://github.com/pingcap/tiup/blob/master/embed/examples/cluster/topology.example.yaml) 配置模板的格式，将希望修改的参数填到拓扑文件的 `server_configs` 下面。
->>>>>>> 43e24c3d4 (tiup: fix dead links (#6852))
 
     {{< copyable "shell-regular" >}}