idk/go-i2p
1
0
Fork 0
mirror of https://github.com/go-i2p/go-i2p.git synced 2025-06-15 21:28:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts in lib/transport/noise

Browse Source
This commit is contained in:
eyedeekay
2024-10-03 22:42:00 -04:00
parent 1eb29ec4ab 9f4154ff45
commit 2b18b2941d
15 changed files with 698 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
go.mod
View File

@ -5,14 +5,26 @@ go 1.22
toolchain go1.22.5
require (
<<<<<<< HEAD
github.com/emirpasic/gods v1.18.1
github.com/flynn/noise v1.1.0
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
=======
github.com/eyedeekay/go-unzip v0.0.0-20240201194209-560d8225b50e
github.com/flynn/noise v1.1.0
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
go.step.sm/crypto v0.51.2
>>>>>>> 9f4154ff457f962bc3b5d77e266b5d87b4de3742
golang.org/x/crypto v0.26.0
)
require (
<<<<<<< HEAD
=======
filippo.io/edwards25519 v1.1.0 // indirect
>>>>>>> 9f4154ff457f962bc3b5d77e266b5d87b4de3742
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/sys v0.24.0 // indirect