Skip to content

Commit

Permalink
chore: solving conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmichalek132
jmichalek132 committed Dec 15, 2024
1 parent a037f25 commit e790e84
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions receiver/prometheusreceiver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ require (
golang.org/x/tools v0.23.0 // indirect
gonum.org/v1/gonum v0.15.1 // indirect
google.golang.org/api v0.188.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 // indirect
google.golang.org/grpc v1.68.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
10 changes: 4 additions & 6 deletions receiver/prometheusreceiver/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e790e84

Please sign in to comment.