@@ -322,6 +322,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
322
322
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 /go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc =
323
323
<<<<<<< HEAD
324
324
<<<<<<< HEAD
325
+ <<<<<<< HEAD
325
326
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 /go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc =
326
327
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA =
327
328
golang.org/x/crypto v0.21.0 /go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs =
@@ -333,6 +334,10 @@ golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v
333
334
golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ =
334
335
golang.org/x/crypto v0.29.0 /go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg =
335
336
>>>>>>> 49bba22 (Update wormhole again for some dependency updates)
337
+ =======
338
+ golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U =
339
+ golang.org/x/crypto v0.31.0 /go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk =
340
+ >>>>>>> 4d9398c (Update golang.org/x dependencies)
336
341
golang.org/x/exp v0.0.0-20190121172915-509febef88a4 /go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA =
337
342
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8 /go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA =
338
343
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522 /go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8 =
@@ -412,6 +417,7 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd
412
417
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 /go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM =
413
418
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d /go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y =
414
419
<<<<<<< HEAD
420
+ <<<<<<< HEAD
415
421
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 /go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y =
416
422
golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4 /go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y =
417
423
golang.org/x/net v0.0.0-20220722155237-a158d28d115b /go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c =
@@ -422,6 +428,10 @@ golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
422
428
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac =
423
429
golang.org/x/net v0.25.0 /go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM =
424
430
>>>>>>> 1c277a2 (Update Fyne to get new deps)
431
+ =======
432
+ golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I =
433
+ golang.org/x/net v0.33.0 /go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4 =
434
+ >>>>>>> 4d9398c (Update golang.org/x dependencies)
425
435
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be /go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U =
426
436
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 /go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw =
427
437
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 /go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw =
@@ -492,6 +502,7 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
492
502
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e /go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg =
493
503
<<<<<<< HEAD
494
504
<<<<<<< HEAD
505
+ <<<<<<< HEAD
495
506
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a /go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg =
496
507
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f /go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg =
497
508
golang.org/x/sys v0.0.0-20220908164124-27713097b956 /go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg =
@@ -507,6 +518,10 @@ golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
507
518
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s =
508
519
golang.org/x/sys v0.27.0 /go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA =
509
520
>>>>>>> 49bba22 (Update wormhole again for some dependency updates)
521
+ =======
522
+ golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA =
523
+ golang.org/x/sys v0.28.0 /go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA =
524
+ >>>>>>> 4d9398c (Update golang.org/x dependencies)
510
525
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 /go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo =
511
526
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c /go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ =
512
527
golang.org/x/text v0.3.0 /go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ =
@@ -516,8 +531,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
516
531
golang.org/x/text v0.3.4 /go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ =
517
532
golang.org/x/text v0.3.5 /go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ =
518
533
golang.org/x/text v0.3.6 /go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ =
519
- golang.org/x/text v0.20 .0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug =
520
- golang.org/x/text v0.20 .0 /go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4 =
534
+ golang.org/x/text v0.21 .0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo =
535
+ golang.org/x/text v0.21 .0 /go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ =
521
536
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c /go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ =
522
537
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 /go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ =
523
538
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 /go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ =
0 commit comments