diff options
| author | obscuren <geffobscura@gmail.com> | 2014-11-29 04:44:34 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-11-29 04:44:34 +0800 |
| commit | 1bce02eff70db43b98d68fcd094fd2e15745b021 (patch) | |
| tree | a69acb327b4f71d59b297ca778450c128dce85f8 /chain/chain_manager.go | |
| parent | 8cf9ed0ea588e97f2baf0f834248727e8fbca18f (diff) | |
| parent | a3559c5e1b469890bb8d71e9992175febaae31c7 (diff) | |
| download | go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.gz go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.bz2 go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.lz go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.xz go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.tar.zst go-tangerine-1bce02eff70db43b98d68fcd094fd2e15745b021.zip | |
Fixed merge
Diffstat (limited to 'chain/chain_manager.go')
| -rw-r--r-- | chain/chain_manager.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chain/chain_manager.go b/chain/chain_manager.go index 11e16fa7d..115acb1c8 100644 --- a/chain/chain_manager.go +++ b/chain/chain_manager.go @@ -112,8 +112,6 @@ func (bc *ChainManager) NewBlock(coinbase []byte) *types.Block { nil, "") - block.MinGasPrice = big.NewInt(10000000000000) - parent := bc.CurrentBlock if parent != nil { block.Difficulty = CalcDifficulty(block, parent) |