LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Fix merge conflict.

Browse source
This commit is contained in:
Dave Collins 2014-01-17 15:45:23 -06:00
parent f089853d4d
commit 75554fab09
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rpcwebsocket.go
View file

@ -219,7 +219,6 @@ func (r *wsContext) CloseListeners(n ntfnChan) {
func newWebsocketContext() *wsContext { func newWebsocketContext() *wsContext {
return &wsContext{ return &wsContext{
connections: make(map[ntfnChan]*requestContexts), connections: make(map[ntfnChan]*requestContexts),
walletNotificationMaster: make(ntfnChan),
txNotifications: make(map[string]*list.List), txNotifications: make(map[string]*list.List),
spentNotifications: make(map[btcwire.OutPoint]*list.List), spentNotifications: make(map[btcwire.OutPoint]*list.List),
minedTxNotifications: make(map[btcwire.ShaHash]*list.List), minedTxNotifications: make(map[btcwire.ShaHash]*list.List),