public/rancher-docs
1
0
Fork 0
mirror of https://github.com/rancher/rancher-docs.git synced 2026-09-26 13:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Git merge left "HEAD" marks

Browse Source 
Removing "<<<< HEAD" and ">>> Fix installation doc errors", probably from other commits.
This commit is contained in:
Zilmar de Souza Junior
2020-10-08 17:51:41 -03:00
committed by GitHub
parent 8594f54ee4
commit cc6253f850
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/rancher/v2.x/en/installation/resources/k8s-tutorials/ha-RKE/_index.md
+2 -3
View File
@@ -169,8 +169,7 @@ Save a copy of the following files in a secure location:
### Issues or errors? ### Issues or errors?
See the [Troubleshooting]({{<baseurl>}}/rancher/v2.x/en/installation/options/troubleshooting/) page. See the [Troubleshooting]({{<baseurl>}}/rancher/v2.x/en/installation/options/troubleshooting/) page.
<<<<<<< HEAD
### [Next: Install Rancher]({{<baseurl>}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/) ### [Next: Install Rancher]({{<baseurl>}}/rancher/v2.x/en/installation/k8s-install/helm-rancher/)
=======
>>>>>>> Fix installation doc errors