From 68254ebba8ccbe65b4fafe9b7d2f41487e543116 Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Mon, 13 Sep 2021 14:49:28 -0700 Subject: [PATCH] Remove merge conflict remnants (#3513) --- .../tools/cluster-monitoring/prometheus/_index.md | 4 ---- .../en/best-practices/rancher-managed/containers/_index.md | 4 ---- 2 files changed, 8 deletions(-) diff --git a/content/rancher/v2.0-v2.4/en/cluster-admin/tools/cluster-monitoring/prometheus/_index.md b/content/rancher/v2.0-v2.4/en/cluster-admin/tools/cluster-monitoring/prometheus/_index.md index 18b4b723646..01c490eb02f 100644 --- a/content/rancher/v2.0-v2.4/en/cluster-admin/tools/cluster-monitoring/prometheus/_index.md +++ b/content/rancher/v2.0-v2.4/en/cluster-admin/tools/cluster-monitoring/prometheus/_index.md @@ -6,11 +6,7 @@ aliases: - /rancher/v2.0-v2.4/en/cluster-admin/tools/monitoring/prometheus/ - /rancher/v2.0-v2.4/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/prometheus - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/prometheus -<<<<<<< HEAD - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/prometheus/ -======= - - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/prometheus/ ->>>>>>> Delete 2.x docs and add redirects for all deleted pages --- _Available as of v2.2.0_ diff --git a/content/rancher/v2.5/en/best-practices/rancher-managed/containers/_index.md b/content/rancher/v2.5/en/best-practices/rancher-managed/containers/_index.md index f923a0313c6..8e104b8a43e 100644 --- a/content/rancher/v2.5/en/best-practices/rancher-managed/containers/_index.md +++ b/content/rancher/v2.5/en/best-practices/rancher-managed/containers/_index.md @@ -4,11 +4,7 @@ weight: 100 aliases: - /rancher/v2.5/en/best-practices/containers - /rancher/v2.5/en/best-practices/v2.5/rancher-managed/containers -<<<<<<< HEAD - /rancher/v2.x/en/best-practices/v2.5/rancher-managed/containers/ -======= - - /rancher/v2.x/en/best-practices/v2.5/rancher-managed/containers/ ->>>>>>> Delete 2.x docs and add redirects for all deleted pages --- Running well-built containers can greatly impact the overall performance and security of your environment.