fix merge conflict

5 years ago · ad3c31ba71
parent 765047222b
commit ad3c31ba71
1 changed files with 2 additions and 4 deletions
--- 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"