public/rancher-docs
1
0
Fork 0
mirror of https://github.com/rancher/rancher-docs.git synced 2026-09-28 22:18:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove merge conflict remnants (#3513)

Browse Source
This commit is contained in:
Billy Tat
2021-09-13 14:49:28 -07:00
committed by GitHub
parent 1cf5c35c61
commit 68254ebba8
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/rancher/v2.0-v2.4/en/cluster-admin/tools/cluster-monitoring/prometheus/_index.md
-4
View File
@@ -6,11 +6,7 @@ aliases:
- /rancher/v2.0-v2.4/en/cluster-admin/tools/monitoring/prometheus/ - /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/legacy/monitoring/cluster-monitoring/prometheus
- /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/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/
=======
- /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_ _Available as of v2.2.0_
content/rancher/v2.5/en/best-practices/rancher-managed/containers/_index.md
-4
View File
@@ -4,11 +4,7 @@ weight: 100
aliases: aliases:
- /rancher/v2.5/en/best-practices/containers - /rancher/v2.5/en/best-practices/containers
- /rancher/v2.5/en/best-practices/v2.5/rancher-managed/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/
=======
- /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. Running well-built containers can greatly impact the overall performance and security of your environment.