diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-13 18:46:40 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-13 18:46:40 +0800 |
| commit | dd60382fc3724ee9c9507cba8df9e6d6db1d5d51 (patch) | |
| tree | 65cf02326774f51a6c3fa96dbc71dd0ddecbc6cd /ethereal/ethereum.go | |
| parent | 32c6126593100d37c38e423ec62c56938e5f9155 (diff) | |
| parent | c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78 (diff) | |
| download | dexon-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.gz dexon-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.tar.zst dexon-dd60382fc3724ee9c9507cba8df9e6d6db1d5d51.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
ethereal/ethereum.go
ethereum/ethereum.go
Diffstat (limited to 'ethereal/ethereum.go')
| -rw-r--r-- | ethereal/ethereum.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go index fd8c56dae..15a454bdf 100644 --- a/ethereal/ethereum.go +++ b/ethereal/ethereum.go @@ -100,7 +100,7 @@ func main() { } if StartRpc { - ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum)) + ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort) if err != nil { log.Println("Could not start RPC interface:", err) } else { |