[release/1.4.9] Revert "core: update DAO soft-fork number, clean up the code"

This reverts commit aefffc9ed8.
2016-06-29 11:53:06 +03:00
parent f4aebd4c8d
commit 3eef19598e
10 changed files with 67 additions and 49 deletions
--- 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,