Skip to content
Snippets Groups Projects
Commit 61a51e19 authored by Hans Moog's avatar Hans Moog
Browse files

Merge branch 'develop.mergeBinary' of https://github.com/iotaledger/goshimmer...

Merge branch 'develop.mergeBinary' of https://github.com/iotaledger/goshimmer into develop.mergeBinary
parents bd839f96 b69a5b74
Branches
Tags
No related merge requests found
module github.com/iotaledger/goshimmer module github.com/iotaledger/goshimmer
go 1.13 go 1.14
require ( require (
github.com/dgraph-io/badger/v2 v2.0.1 github.com/dgraph-io/badger/v2 v2.0.1
...@@ -13,7 +13,7 @@ require ( ...@@ -13,7 +13,7 @@ require (
github.com/googollee/go-engine.io v1.4.3-0.20190924125625-798118fc0dd2 github.com/googollee/go-engine.io v1.4.3-0.20190924125625-798118fc0dd2
github.com/googollee/go-socket.io v1.4.3-0.20191204093753-683f8725b6d0 github.com/googollee/go-socket.io v1.4.3-0.20191204093753-683f8725b6d0
github.com/gorilla/websocket v1.4.1 github.com/gorilla/websocket v1.4.1
github.com/iotaledger/hive.go v0.0.0-20200227215953-967611cd154b github.com/iotaledger/hive.go v0.0.0-20200225104639-95ee10a0e675
github.com/iotaledger/iota.go v1.0.0-beta.14 github.com/iotaledger/iota.go v1.0.0-beta.14
github.com/kr/pretty v0.2.0 // indirect github.com/kr/pretty v0.2.0 // indirect
github.com/kr/text v0.2.0 // indirect github.com/kr/text v0.2.0 // indirect
......
...@@ -126,7 +126,6 @@ func (transfer *Transfer) UnmarshalBinary(data []byte) error { ...@@ -126,7 +126,6 @@ func (transfer *Transfer) UnmarshalBinary(data []byte) error {
} }
return nil return nil
} }
// define contracts (ensure that the struct fulfills the corresponding interfaces // define contracts (ensure that the struct fulfills the corresponding interfaces
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment