change 2 aliases in 4.0 (pingcap#2920)

Co-authored-by: ti-srebot <66930949+ti-srebot@users.noreply.github.com>
ti-chi-bot · Jun 17, 2020 · 66173bb · 66173bb
1 parent b3039ac
commit 66173bb
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/deploy-monitoring-services.md b/deploy-monitoring-services.md
@@ -2,11 +2,7 @@
 title: Deploy Monitoring Services for the TiDB Cluster
 summary: Learn how to deploy monitoring services for the TiDB cluster.
 category: how-to
-<<<<<<< HEAD:monitor-a-tidb-cluster.md
-aliases: ['/docs/stable/how-to/monitor/monitor-a-cluster/']
-=======
-aliases: ['/docs/dev/how-to/monitor/monitor-a-cluster/','/docs/dev/monitor-a-tidb-cluster/']
->>>>>>> 81d016b... add 3 monitoring documents (#2791):deploy-monitoring-services.md
+aliases: ['/docs/stable/how-to/monitor/monitor-a-cluster/','/docs/stable/monitor-a-tidb-cluster/']
 ---
 
 # Deploy Monitoring Services for the TiDB Cluster