Skip to content

Commit

Permalink
fix faulty merge
Browse files Browse the repository at this point in the history
Signed-off-by: Anirudh Jain <anirudh.jain@outlook.com>
  • Loading branch information
anirudhjain75 committed Jan 7, 2021
1 parent f1e25d5 commit 983c09b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 92 deletions.
90 changes: 0 additions & 90 deletions mesheryctl/internal/cli/root/cfg/cfg.go

This file was deleted.

3 changes: 1 addition & 2 deletions mesheryctl/internal/cli/root/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -54,7 +53,7 @@ var versionCmd = &cobra.Command{
build := version
commitsha := commitsha

version := cfg.Version{
version := config.Version{
Build: "unavailable",
CommitSHA: "unavailable",
ReleaseChannel: "unavailable",
Expand Down

0 comments on commit 983c09b

Please sign in to comment.