From 0b2816f45271d70b055deb691e8fabde083ad032 Mon Sep 17 00:00:00 2001 From: Kevin Labesse Date: Thu, 21 Mar 2019 17:18:43 +0100 Subject: [PATCH] fix merge doc Signed-off-by: Kevin Labesse --- docs/helm/helm_install.md | 3 --- docs/helm/helm_upgrade.md | 3 --- 2 files changed, 6 deletions(-) diff --git a/docs/helm/helm_install.md b/docs/helm/helm_install.md index e4b12ce92..0745f814b 100644 --- a/docs/helm/helm_install.md +++ b/docs/helm/helm_install.md @@ -78,11 +78,8 @@ helm install [CHART] [flags] ### Options ``` -<<<<<<< HEAD --app-version string specify an app version for the release -======= --atomic if set, installation process purges chart on fail, also sets --wait flag ->>>>>>> master --ca-file string verify certificates of HTTPS-enabled servers using this CA bundle --cert-file string identify HTTPS client using this SSL certificate file --dep-up run helm dependency update before installing the chart diff --git a/docs/helm/helm_upgrade.md b/docs/helm/helm_upgrade.md index 5dfdb37bd..d5a7337a6 100644 --- a/docs/helm/helm_upgrade.md +++ b/docs/helm/helm_upgrade.md @@ -65,11 +65,8 @@ helm upgrade [RELEASE] [CHART] [flags] ### Options ``` -<<<<<<< HEAD --app-version string specify the app version to use for the upgrade -======= --atomic if set, upgrade process rolls back changes made in case of failed upgrade, also sets --wait flag ->>>>>>> master --ca-file string verify certificates of HTTPS-enabled servers using this CA bundle --cert-file string identify HTTPS client using this SSL certificate file --description string specify the description to use for the upgrade, rather than the default