From 45890175edb7a9bb386e2e8a24c75b57d390563d Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Mon, 1 Oct 2018 10:39:52 -0700 Subject: [PATCH] fixing conflict --- .../air-gap-installation/install-rancher/_index.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md b/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md index 83abb50a520..cb94327ada6 100644 --- a/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md @@ -1,10 +1,6 @@ --- title: 2—Installing Rancher weight: 50 -<<<<<<< HEAD -draft: true -======= ->>>>>>> removing draft flag for air gap --- After your private registry is setup for your Rancher installation, complete that installation. Follow one of the procedures below based on the configuration in which you want to run Rancher.