From ad3c31ba717624729e0ff01ca0b4a7c3f1353e13 Mon Sep 17 00:00:00 2001 From: Vlad Fratila Date: Wed, 30 Sep 2020 20:00:58 +0300 Subject: [PATCH] fix merge conflict --- cmd/helm/install.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/helm/install.go b/cmd/helm/install.go index 27daa710f..300d23e87 100644 --- a/cmd/helm/install.go +++ b/cmd/helm/install.go @@ -17,13 +17,11 @@ limitations under the License. package main import ( + "fmt" "io" -<<<<<<< HEAD "io/ioutil" - "strings" -======= "log" ->>>>>>> feat(comp): Provide completion for --version flag + "strings" "time" "github.com/pkg/errors"