diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-04 03:34:48 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-04 03:34:48 +0800 |
| commit | bb152612e0466164d33ff7f2023d804d7db18c01 (patch) | |
| tree | e4210c42c574e986fd886c753258b7d063597095 /cmd/mist/main.go | |
| parent | cfe3af099c7fb4b637132a5c0ab2b94569418084 (diff) | |
| parent | 253eb778d19af9204c9dd65e3963bd63f3bab6f0 (diff) | |
| download | dexon-bb152612e0466164d33ff7f2023d804d7db18c01.tar dexon-bb152612e0466164d33ff7f2023d804d7db18c01.tar.gz dexon-bb152612e0466164d33ff7f2023d804d7db18c01.tar.bz2 dexon-bb152612e0466164d33ff7f2023d804d7db18c01.tar.lz dexon-bb152612e0466164d33ff7f2023d804d7db18c01.tar.xz dexon-bb152612e0466164d33ff7f2023d804d7db18c01.tar.zst dexon-bb152612e0466164d33ff7f2023d804d7db18c01.zip | |
Merge branch 'develop' into poc-9
Conflicts:
cmd/utils/cmd.go
Diffstat (limited to 'cmd/mist/main.go')
| -rw-r--r-- | cmd/mist/main.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cmd/mist/main.go b/cmd/mist/main.go index c9a07bfde..1d4403848 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -76,10 +76,6 @@ func run() error { utils.StartRpc(ethereum, RpcListenAddress, RpcPort) } - if StartWebSockets { - utils.StartWebSockets(ethereum, WsPort) - } - gui := NewWindow(ethereum, config, KeyRing, LogLevel) utils.RegisterInterrupt(func(os.Signal) { |