diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-04 03:30:05 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-04 03:30:05 +0800 |
| commit | f0b2ea64fc331fe6ef9f15097ac2d129dd9b7207 (patch) | |
| tree | b54c28e87d0a64cab079c08108672b8d7e39d5f2 /eth/protocol_test.go | |
| parent | 27078919669ad99bfb51b468f7c475120e6e148a (diff) | |
| parent | 6c2856df2335dec946a5ebc14a4438b261e0c881 (diff) | |
| download | go-tangerine-f0b2ea64fc331fe6ef9f15097ac2d129dd9b7207.tar.gz go-tangerine-f0b2ea64fc331fe6ef9f15097ac2d129dd9b7207.tar.zst go-tangerine-f0b2ea64fc331fe6ef9f15097ac2d129dd9b7207.zip | |
Merge branch 'jsonlogs' of https://github.com/ethersphere/go-ethereum into ethersphere-jsonlogs
Conflicts:
eth/block_pool.go
eth/block_pool_test.go
eth/protocol_test.go
miner/worker.go
Diffstat (limited to 'eth/protocol_test.go')
| -rw-r--r-- | eth/protocol_test.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/eth/protocol_test.go b/eth/protocol_test.go index f499d033e..c4e3e9f1b 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -13,7 +13,6 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/errs" "github.com/ethereum/go-ethereum/ethutil" - ethlogger "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/discover" ) |