From cc6253f8501249432f6edcc2bbdccef7952a603e Mon Sep 17 00:00:00 2001 From: Zilmar de Souza Junior Date: Thu, 8 Oct 2020 17:51:41 -0300 Subject: [PATCH] Git merge left "HEAD" marks Removing "<<<< HEAD" and ">>> Fix installation doc errors", probably from other commits. --- .../en/installation/resources/k8s-tutorials/ha-RKE/_index.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/content/rancher/v2.x/en/installation/resources/k8s-tutorials/ha-RKE/_index.md b/content/rancher/v2.x/en/installation/resources/k8s-tutorials/ha-RKE/_index.md index dc8bbda172e..aaa9c964713 100644 --- a/content/rancher/v2.x/en/installation/resources/k8s-tutorials/ha-RKE/_index.md +++ b/content/rancher/v2.x/en/installation/resources/k8s-tutorials/ha-RKE/_index.md @@ -169,8 +169,7 @@ Save a copy of the following files in a secure location: ### Issues or errors? See the [Troubleshooting]({{}}/rancher/v2.x/en/installation/options/troubleshooting/) page. -<<<<<<< HEAD + ### [Next: Install Rancher]({{}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/) -======= ->>>>>>> Fix installation doc errors +