Merge pull request #2230 from anirudhjain75/fix-faulty-merge

Remove cfg.go and its remnants from a faulty merge
meshery · Jan 7, 2021 · ba524f3 · ba524f3
2 parents f1e25d5 + 983c09b
commit ba524f3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 92 deletions.
diff --git a/mesheryctl/internal/cli/root/cfg/cfg.go b/mesheryctl/internal/cli/root/cfg/cfg.go
diff --git a/mesheryctl/internal/cli/root/version.go b/mesheryctl/internal/cli/root/version.go
@@ -21,7 +21,6 @@ import (
 	"net/http"
 
 	"github.com/layer5io/meshery/handlers"
-	"github.com/layer5io/meshery/mesheryctl/internal/cli/root/cfg"
 	"github.com/layer5io/meshery/mesheryctl/internal/cli/root/config"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -54,7 +53,7 @@ var versionCmd = &cobra.Command{
 		build := version
 		commitsha := commitsha
 
-		version := cfg.Version{
+		version := config.Version{
 			Build:          "unavailable",
 			CommitSHA:      "unavailable",
 			ReleaseChannel: "unavailable",