diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-06-29 17:17:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-29 17:17:18 +0800 |
| commit | fd4e161497156a5d12fd8712f41574bc7fb20404 (patch) | |
| tree | 56ce21d1aaf6df3908335601a687f0f3ac4a50be /cmd/geth | |
| parent | e0493457d5a9d280554990b5a29c4fcad69e7d0b (diff) | |
| parent | 6362a9d6102b26e926b3e73563267fc75cb30f9c (diff) | |
| download | go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.tar go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.gz go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.bz2 go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.lz go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.xz go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.zst go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.zip | |
Merge pull request #2752 from karalabe/revert-soft-fork
Revert faulty DAO soft-fork
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/main.go | 1 | ||||
| -rw-r--r-- | cmd/geth/usage.go | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 95aad3bea..c372430f1 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -169,7 +169,6 @@ participating. utils.MiningGPUFlag, utils.AutoDAGFlag, utils.TargetGasLimitFlag, - utils.DAOSoftForkFlag, utils.NATFlag, utils.NatspecEnabledFlag, utils.NoDiscoverFlag, diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index 10bc56b97..e7ef9e2c7 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -128,7 +128,6 @@ var AppHelpFlagGroups = []flagGroup{ utils.TargetGasLimitFlag, utils.GasPriceFlag, utils.ExtraDataFlag, - utils.DAOSoftForkFlag, }, }, { |