This is an automated cherry-pick of pingcap#15070

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Oct 16, 2023 · e1e31a2 · e1e31a2
1 parent ce6941f
commit e1e31a2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/hybrid-deployment-topology.md b/hybrid-deployment-topology.md
@@ -23,8 +23,13 @@ The deployment machine has multiple CPU processors with sufficient memory. To im
 
 ### Topology templates
 
+<<<<<<< HEAD
 - [The simple template for the hybrid deployment](https://github.com/pingcap/docs/blob/release-4.0/config-templates/simple-multi-instance.yaml)
 - [The complex template for the hybrid deployment](https://github.com/pingcap/docs/blob/release-4.0/config-templates/complex-multi-instance.yaml)
+=======
+- [The simple template for the hybrid deployment](https://github.com/pingcap/docs/blob/master/config-templates/simple-multi-instance.yaml)
+- [The complex template for the hybrid deployment](https://github.com/pingcap/docs/blob/master/config-templates/complex-multi-instance.yaml)
+>>>>>>> 4f2fda6f27 (fix a link to topology file (#15070))
 
 For detailed descriptions of the configuration items in the above TiDB cluster topology file, see [Topology Configuration File for Deploying TiDB Using TiUP](/tiup/tiup-cluster-topology-reference.md).