diff options
author | slush0 <slush@satoshilabs.com> | 2014-02-07 13:26:12 +0100 |
---|---|---|
committer | slush0 <slush@satoshilabs.com> | 2014-02-07 13:26:12 +0100 |
commit | 65442116b49f505a25f51d5490e98f4dd2c94f37 (patch) | |
tree | d4c00bac721726ae3027ab770bb46ddea56afb65 /bip-0039 | |
parent | 8eddd5b5f4e985c0abe82d2e0f5b1ab7291641a7 (diff) | |
parent | fe7137f6ef92f45a34ed73af79a37ac98912f856 (diff) | |
download | bips-65442116b49f505a25f51d5490e98f4dd2c94f37.tar.xz |
Fixed conflict
Conflicts:
README.mediawiki
Diffstat (limited to 'bip-0039')
0 files changed, 0 insertions, 0 deletions