Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop

633027d9 · obscuren · d3d043db · 70e1a1a4 · 633027d9
Commit 633027d9 authored Jul 03, 2014 by obscuren
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

state_object.go ethchain/state_object.go +0 -1

No files found.
--- a/ethchain/state_object.go
+++ b/ethchain/state_object.go
@@ -248,7 +248,6 @@ func (c *StateObject) RlpDecode(data []byte) {
 	c.Nonce = decoder.Get(0).Uint()
 	c.Amount = decoder.Get(1).BigInt()
 	c.state = NewState(ethtrie.NewTrie(ethutil.Config.Db, decoder.Get(2).Interface()))
-	c.state = NewState(ethtrie.NewTrie(ethutil.Config.Db, decoder.Get(2).Interface()))

 	c.ScriptHash = decoder.Get(3).Bytes()