obscuren 64f35ba8d1 merge errors fixed

2014-12-02 11:52:56 +01:00

..

block.go

Fixed merge

2014-11-28 21:44:34 +01:00

bloom9_test.go

Merge branch 'tests' into poc8

2014-11-18 19:48:35 +01:00

bloom9.go

Begin of moving objects to types package

2014-11-18 16:58:22 +01:00

common.go

Begin of moving objects to types package

2014-11-18 16:58:22 +01:00

derive_sha.go

Begin of moving objects to types package

2014-11-18 16:58:22 +01:00

receipt.go

Begin of moving objects to types package

2014-11-18 16:58:22 +01:00

transaction_test.go

Begin of moving objects to types package

2014-11-18 16:58:22 +01:00

transaction.go

merge errors fixed

2014-12-02 11:52:56 +01:00