File tree Expand file tree Collapse file tree 4 files changed +16
-4
lines changed
Expand file tree Collapse file tree 4 files changed +16
-4
lines changed Original file line number Diff line number Diff line change @@ -2354,11 +2354,11 @@ SOFTWARE.
23542354
23552355--------------------------------------------------------------------------------
23562356Dependency : github.com/oapi-codegen/runtime
2357- Version: v1.2 .0
2357+ Version: v1.3 .0
23582358Licence type (autodetected): Apache-2.0
23592359--------------------------------------------------------------------------------
23602360
2361- Contents of probable licence file $GOMODCACHE/github.com/oapi-codegen/runtime@v1.2 .0/LICENSE:
2361+ Contents of probable licence file $GOMODCACHE/github.com/oapi-codegen/runtime@v1.3 .0/LICENSE:
23622362
23632363 Apache License
23642364 Version 2.0, January 2004
Original file line number Diff line number Diff line change @@ -2354,11 +2354,11 @@ SOFTWARE.
23542354
23552355--------------------------------------------------------------------------------
23562356Dependency : github.com/oapi-codegen/runtime
2357- Version: v1.2 .0
2357+ Version: v1.3 .0
23582358Licence type (autodetected): Apache-2.0
23592359--------------------------------------------------------------------------------
23602360
2361- Contents of probable licence file $GOMODCACHE/github.com/oapi-codegen/runtime@v1.2 .0/LICENSE:
2361+ Contents of probable licence file $GOMODCACHE/github.com/oapi-codegen/runtime@v1.3 .0/LICENSE:
23622362
23632363 Apache License
23642364 Version 2.0, January 2004
Original file line number Diff line number Diff line change @@ -21,7 +21,12 @@ require (
2121 github.com/magefile/mage v1.16.0
2222 github.com/mailru/easyjson v0.9.2
2323 github.com/miolini/datacounter v1.0.3
24+ <<<<<<< HEAD
2425 github.com/oapi-codegen/runtime v1.2.0
26+ =======
27+ github.com/oapi-codegen/runtime v1.3.0
28+ github.com/open-telemetry/opamp-go v0.23.0
29+ >>>>>>> debd00e (build(deps): bump github.com/oapi-codegen/runtime from 1.2.0 to 1.3.0 (#6618))
2530 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
2631 github.com/prometheus/client_golang v1.23.2
2732 github.com/rs/xid v1.6.0
Original file line number Diff line number Diff line change @@ -121,8 +121,15 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
121121github.com/moby/docker-image-spec v1.3.1 /go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo =
122122github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA =
123123github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 /go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ =
124+ <<<<<<< HEAD
124125github.com/oapi-codegen/runtime v1.2.0 h1:RvKc1CVS1QeKSNzO97FBQbSMZyQ8s6rZd+LpmzwHMP4 =
125126github.com/oapi-codegen/runtime v1.2.0 /go.mod h1:Y7ZhmmlE8ikZOmuHRRndiIm7nf3xcVv+YMweKgG1DT0 =
127+ =======
128+ github.com/oapi-codegen/runtime v1.3.0 h1:vyK1zc0gDWWXgk2xoQa4+X4RNNc5SL2RbTpJS/4vMYA =
129+ github.com/oapi-codegen/runtime v1.3.0 /go.mod h1:kOdeacKy7t40Rclb1je37ZLFboFxh+YLy0zaPCMibPY =
130+ github.com/open-telemetry/opamp-go v0.23.0 h1:k7h7w/muprut9/DAhUC4anX4v7hIdgO02gIsSjV4uq0 =
131+ github.com/open-telemetry/opamp-go v0.23.0 /go.mod h1:DIIVdkLefdqPW5L+4I2twmAicVrTB0Bp5XJAfedZzAM =
132+ >>>>>>> debd00e (build(deps): bump github.com/oapi-codegen/runtime from 1.2.0 to 1.3.0 (#6618))
126133github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U =
127134github.com/opencontainers/go-digest v1.0.0 /go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM =
128135github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM =
You can’t perform that action at this time.
0 commit comments