diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-30 03:41:10 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-30 03:41:10 +0800 |
| commit | bd992e7baf5da01e97fe4e0c85184716daafa7e5 (patch) | |
| tree | d159e9d44c6a9b90497d01ba8663865d3f7c8b98 /rpc/ws | |
| parent | 0031f388ac1f6f4a23c5c75e5eeb4a007f0b2f31 (diff) | |
| parent | 447bad9dbd9ef033332b1166f7ac95aab5b82e43 (diff) | |
| download | dexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.tar dexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.tar.gz dexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.tar.bz2 dexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.tar.lz dexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.tar.xz dexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.tar.zst dexon-bd992e7baf5da01e97fe4e0c85184716daafa7e5.zip | |
Merge branch 'qt5.4' of github.com-obscure:ethereum/go-ethereum into qt5.4
Conflicts:
rpc/message.go
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 37b08ebd9..2853181ec 100644 --- a/rpc/ws/server.go +++ b/rpc/ws/server.go @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with go-ethereum. If not, see <http://www.gnu.org/licenses/>. */ -package ws +package rpcws import ( "fmt" |