...

2014-05-20 13:09:44 +02:00 · 2014-05-20 13:09:44 +02:00 · 45b810450f
commit 45b810450f
parent f292e93e0e
1 changed files with 0 additions and 5 deletions
--- a/ethchain/transaction.go
+++ b/ethchain/transaction.go
@ -109,11 +109,6 @@ func (tx *Transaction) Sign(privk []byte) error {
 	return nil
 }

-<<<<<<< HEAD
-=======
-// [ NONCE, GASPRICE, GAS, TO, VALUE, DATA, V, R, S ]
-// [ NONCE, GASPRICE, GAS, 0, VALUE, CODE, INIT, V, R, S ]
->>>>>>> 38b4dc2cdf23380532a25240760273dd07b9dff6
 func (tx *Transaction) RlpData() interface{} {
 	data := []interface{}{tx.Nonce, tx.GasPrice, tx.Gas, tx.Recipient, tx.Value, tx.Data}