From 75554fab090968e5fc9b154bf9d53b8e26753eb3 Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Fri, 17 Jan 2014 15:45:23 -0600 Subject: [PATCH] Fix merge conflict. --- rpcwebsocket.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rpcwebsocket.go b/rpcwebsocket.go index a3d6a922..bbff3e72 100644 --- a/rpcwebsocket.go +++ b/rpcwebsocket.go @@ -218,11 +218,10 @@ func (r *wsContext) CloseListeners(n ntfnChan) { // for handling websocket requests and notifications. 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), + connections: make(map[ntfnChan]*requestContexts), + txNotifications: make(map[string]*list.List), + spentNotifications: make(map[btcwire.OutPoint]*list.List), + minedTxNotifications: make(map[btcwire.ShaHash]*list.List), } }