File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -200,7 +200,11 @@ require (
200200 go.uber.org/multierr v1.11.0 // indirect
201201 golang.org/x/image v0.29.0 // indirect
202202 golang.org/x/mod v0.28.0 // indirect
203+ <<<<<<< HEAD
203204 golang.org/x/net v0.43.0 // indirect
205+ =======
206+ golang.org/x/net v0.46.0 // indirect
207+ >>>>>>> 15db7156 (chore(deps): bump github.com/xuri/excelize/v2 from 2.9.1 to 2.10.0 (#1494))
204208 golang.org/x/sync v0.17.0 // indirect
205209 golang.org/x/term v0.36.0 // indirect
206210 google.golang.org/appengine v1.6.8 // indirect
Original file line number Diff line number Diff line change @@ -647,8 +647,13 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT
647647golang.org/x/net v0.0.0-20220722155237-a158d28d115b /go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c =
648648golang.org/x/net v0.6.0 /go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs =
649649golang.org/x/net v0.9.0 /go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns =
650+ <<<<<<< HEAD
650651golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE =
651652golang.org/x/net v0.43.0 /go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg =
653+ =======
654+ golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4 =
655+ golang.org/x/net v0.46.0 /go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210 =
656+ >>>>>>> 15db7156 (chore(deps): bump github.com/xuri/excelize/v2 from 2.9.1 to 2.10.0 (#1494))
652657golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f /go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM =
653658golang.org/x/sync v0.0.0-20190423024810-112230192c58 /go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM =
654659golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 /go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM =
You can’t perform that action at this time.
0 commit comments