Merge pull request #5148 from sharifelgamal/cfg

remove duplicate import
pull/5151/head
Sharif Elgamal 2019-08-20 14:04:14 -07:00 committed by GitHub
commit f486b001b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -46,7 +46,6 @@ import (
"k8s.io/minikube/pkg/minikube/bootstrapper/kubeadm"
"k8s.io/minikube/pkg/minikube/cluster"
"k8s.io/minikube/pkg/minikube/command"
"k8s.io/minikube/pkg/minikube/config"
cfg "k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/constants"
"k8s.io/minikube/pkg/minikube/cruntime"
@ -113,7 +112,7 @@ var (
insecureRegistry []string
apiServerNames []string
apiServerIPs []net.IP
extraOptions config.ExtraOptionSlice
extraOptions cfg.ExtraOptionSlice
)
func init() {

View File

@ -36,7 +36,7 @@ var (
Translations map[string]interface{}
)
// T translates the given string to the supplied language.
// T translates the given string to the preferred language.
func T(s string) string {
if preferredLanguage == defaultLanguage {
return s