From bbd4a6092e63ab69e75840aa062ab386429b4cf8 Mon Sep 17 00:00:00 2001 From: lucperkins Date: Wed, 19 Feb 2020 11:17:03 -0800 Subject: [PATCH] Remove errant merge line Signed-off-by: lucperkins --- docs/1.10/install-config/harbor-ha-helm.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/1.10/install-config/harbor-ha-helm.md b/docs/1.10/install-config/harbor-ha-helm.md index 8d7031bdd..c7c897eab 100644 --- a/docs/1.10/install-config/harbor-ha-helm.md +++ b/docs/1.10/install-config/harbor-ha-helm.md @@ -22,9 +22,6 @@ As for storage layer, it is expected that the user provide high available Postgr ![Harbor High Availability with Helm](../../img/ha.png) -## Usage ->>>>>>> fc5b145e09aab0c8ef015872f8694e1dd087ae0b - ## Download Chart Download Harbor helm chart: