Skip to content

Commit

Permalink
Merge pull request #10 from asecurityteam/fix-conflicts-2
Browse files Browse the repository at this point in the history
Fix conflicts 2
  • Loading branch information
gcase555 authored Aug 5, 2024
2 parents e1bdb9b + a3125c3 commit de1ec4a
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 1,505 deletions.
20 changes: 10 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ module github.com/lindell/multi-gitter
go 1.21

require (
code.gitea.io/sdk/gitea v0.18.0
code.gitea.io/sdk/gitea v0.19.0
github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203
github.com/gfleury/go-bitbucket-v1 v0.0.0-20240131155556-0b41d7863037
github.com/go-git/go-git/v5 v5.12.0
github.com/google/go-github/v59 v59.0.0
github.com/ktrysmt/go-bitbucket v0.9.76
github.com/ktrysmt/go-bitbucket v0.9.80
github.com/mitchellh/mapstructure v1.5.0
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.9.0
github.com/xanzy/go-gitlab v0.106.0
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
github.com/xanzy/go-gitlab v0.107.0
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
golang.org/x/oauth2 v0.21.0
)

Expand All @@ -38,7 +38,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand All @@ -60,14 +60,14 @@ require (
github.com/xanzy/ssh-agent v0.3.3 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.22.0 // indirect
golang.org/x/tools v0.23.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit de1ec4a

Please sign in to comment.