fix merge conflict, remove duplicate map entry

This commit is contained in:
Owain G. Ainsworth 2014-01-27 23:29:49 +00:00
parent 34b683b4aa
commit df51a478f4

View file

@ -68,7 +68,6 @@ var rpcHandlers = map[string]cmdHandler{
"listaddressgroupings": Unimplemented, "listaddressgroupings": Unimplemented,
"listlockunspent": Unimplemented, "listlockunspent": Unimplemented,
"listreceivedbyaccount": Unimplemented, "listreceivedbyaccount": Unimplemented,
"listsinceblock": Unimplemented,
"listreceivedbyaddress": Unimplemented, "listreceivedbyaddress": Unimplemented,
"listunspent": Unimplemented, "listunspent": Unimplemented,
"lockunspent": Unimplemented, "lockunspent": Unimplemented,