diff options
author | Steve Moyer <smoyer1@selesy.com> | 2023-01-03 08:37:21 -0500 |
---|---|---|
committer | Steve Moyer <smoyer1@selesy.com> | 2023-01-03 08:37:21 -0500 |
commit | 7601e79d2b60315e259f36e96d7bfdcc92d3fcba (patch) | |
tree | e84c2c8f33d7610ea83da9a8c2ed774a8da0fa48 /commands/root.go | |
parent | 344438b9cb216dd878221600071d3ac8093ad34b (diff) | |
parent | 3915d2b76e17ae7058510d3b4cd91b24786bb526 (diff) | |
download | git-bug-7601e79d2b60315e259f36e96d7bfdcc92d3fcba.tar.gz |
deps: fix merge conflicts in dependencies
Diffstat (limited to 'commands/root.go')
-rw-r--r-- | commands/root.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/commands/root.go b/commands/root.go index d98f9448..cb4fd686 100644 --- a/commands/root.go +++ b/commands/root.go @@ -8,10 +8,9 @@ import ( "github.com/spf13/cobra" "github.com/MichaelMure/git-bug/commands/bridge" - usercmd "github.com/MichaelMure/git-bug/commands/user" - "github.com/MichaelMure/git-bug/commands/bug" "github.com/MichaelMure/git-bug/commands/execenv" + "github.com/MichaelMure/git-bug/commands/user" ) // These variables are initialized externally during the build. See the Makefile. |