Fix merge conflict.
This commit is contained in:
parent
f089853d4d
commit
75554fab09
1 changed files with 4 additions and 5 deletions
|
@ -219,7 +219,6 @@ func (r *wsContext) CloseListeners(n ntfnChan) {
|
|||
func newWebsocketContext() *wsContext {
|
||||
return &wsContext{
|
||||
connections: make(map[ntfnChan]*requestContexts),
|
||||
walletNotificationMaster: make(ntfnChan),
|
||||
txNotifications: make(map[string]*list.List),
|
||||
spentNotifications: make(map[btcwire.OutPoint]*list.List),
|
||||
minedTxNotifications: make(map[btcwire.ShaHash]*list.List),
|
||||
|
|
Loading…
Reference in a new issue