Skip to content

G
Geth-Modification
Commit bb793c82 authored by zsfelfoldi's avatar zsfelfoldi Committed by zelig
Browse files
Options

fixed incomplete merge

parent d8fb8343
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 19 deletions
cmd/utils/flags.go
View file @ bb793c82
...@@ -259,6 +259,8 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config { ...@@ -259,6 +259,8 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
Name: common.MakeName(clientID, version), Name: common.MakeName(clientID, version),
DataDir: ctx.GlobalString(DataDirFlag.Name), DataDir: ctx.GlobalString(DataDirFlag.Name),
ProtocolVersion: ctx.GlobalInt(ProtocolVersionFlag.Name), ProtocolVersion: ctx.GlobalInt(ProtocolVersionFlag.Name),
BlockChainVersion: ctx.GlobalInt(BlockchainVersionFlag.Name),
SkipBcVersionCheck: false,
NetworkId: ctx.GlobalInt(NetworkIdFlag.Name), NetworkId: ctx.GlobalInt(NetworkIdFlag.Name),
LogFile: ctx.GlobalString(LogFileFlag.Name), LogFile: ctx.GlobalString(LogFileFlag.Name),
LogLevel: ctx.GlobalInt(LogLevelFlag.Name), LogLevel: ctx.GlobalInt(LogLevelFlag.Name),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment