diff options
| author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-23 20:05:15 +0800 |
|---|---|---|
| committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-23 20:05:15 +0800 |
| commit | dea65840186fe861017524c9cb59ae07ac97ed06 (patch) | |
| tree | 5cb5e339b9ce77a2a3c92cf8a10c4294fcf7965c /rpc/ws | |
| parent | bb3338df6363d8267a24190584f0908463241a6c (diff) | |
| parent | dd086791acf477da7641c168f82de70ed0b2dca6 (diff) | |
| download | dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.gz dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.bz2 dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.lz dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.xz dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.zst dexon-dea65840186fe861017524c9cb59ae07ac97ed06.zip | |
Merge branch 'develop' into ui
Diffstat (limited to 'rpc/ws')
| -rw-r--r-- | rpc/ws/server.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rpc/ws/server.go b/rpc/ws/server.go index 100713c10..b8cc2fa6b 100644 --- a/rpc/ws/server.go +++ b/rpc/ws/server.go @@ -21,10 +21,10 @@ import ( "net" "net/http" - "code.google.com/p/go.net/websocket" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/xeth" + "golang.org/x/net/websocket" ) var wslogger = logger.NewLogger("RPC-WS") |