diff --git a/go.mod b/go.mod index 33afc6885..ca5eed442 100644 --- a/go.mod +++ b/go.mod @@ -98,10 +98,17 @@ require ( ======= golang.org/x/mod v0.17.0 // indirect <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ======= >>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) >>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 832aabc87..a27eaec4b 100644 --- a/go.sum +++ b/go.sum @@ -250,10 +250,17 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ======= >>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) >>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= @@ -274,10 +281,17 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ======= >>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) >>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= @@ -307,10 +321,17 @@ golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ======= >>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) >>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -323,10 +344,17 @@ golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) ======= >>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) >>>>>>> 7272a99 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 7c63c2f (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +======= +>>>>>>> 68543d3 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 9f986e8 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) +>>>>>>> 5647873 (Bump golang.org/x/net from 0.26.0 to 0.27.0 (#1035)) golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=