fixing conflict

This commit is contained in:
Mark Bishop committed 2018-10-01 10:39:52 -07:00
1 parent a85e51336c
commit 45890175ed
1 file changed
-4
@@ -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.