[conformal/btcd] 75554f: Fix merge conflict.

[Dave Collins]

  Branch: refs/heads/master
  Home:   https://github.com/conformal/btcd
  Commit: 75554fab090968e5fc9b154bf9d53b8e26753eb3
      
https://github.com/conformal/btcd/commit/75554fab090968e5fc9b154bf9d53b8e26753eb3
  Author: Dave Collins <da...@conformal.com>
  Date:   2014-01-17 (Fri, 17 Jan 2014)

  Changed paths:
    M rpcwebsocket.go

  Log Message:
  -----------
  Fix merge conflict.