diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-02-10 18:55:31 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-02-10 18:56:51 +0100 |
| commit | c9da9c4bd83cfd5ffc6ea1a4af42f08a46dfceb1 (patch) | |
| tree | c2e5d45c6401061c00ad1fd9c4c632d850547a42 /src/script | |
| parent | Merge #7490: tests: Remove May15 test (diff) | |
| parent | wallet: Ignore MarkConflict if block hash is not known (diff) | |
| download | discoin-c9da9c4bd83cfd5ffc6ea1a4af42f08a46dfceb1.tar.xz discoin-c9da9c4bd83cfd5ffc6ea1a4af42f08a46dfceb1.zip | |
Merge #7491: wallet: Ignore MarkConflict if block hash is not known
40e7b61 wallet: Ignore MarkConflict if block hash is not known (Wladimir J. van der Laan)
Diffstat (limited to 'src/script')
0 files changed, 0 insertions, 0 deletions