diff options
| author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-16 21:43:30 +0800 |
|---|---|---|
| committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-16 21:43:30 +0800 |
| commit | 3068e2688d88912ec33f3d80fd0fe26c4e897dcd (patch) | |
| tree | ee32ccd17faf650f3e933e9a2d8b4ab52f0d7746 /core/manager.go | |
| parent | 1878630b591b039fadb6f88e15340d04f4af3ed1 (diff) | |
| parent | 68f6ddc5aaa7ff29d09c1519ccd38d9cf16c0f75 (diff) | |
| download | go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.gz go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.bz2 go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.lz go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.xz go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.zst go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.zip | |
merge conflicts
Diffstat (limited to 'core/manager.go')
| -rw-r--r-- | core/manager.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/manager.go b/core/manager.go index 4671573b1..f960fc5f0 100644 --- a/core/manager.go +++ b/core/manager.go @@ -16,7 +16,6 @@ type EthManager interface { IsListening() bool Peers() []*p2p.Peer KeyManager() *crypto.KeyManager - ClientIdentity() p2p.ClientIdentity Db() ethutil.Database EventMux() *event.TypeMux } |