diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2020-01-23 23:59:10 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2020-01-23 23:59:10 +0000 |
| commit | d81cf9da5ee18c9af8f57a63bdb8adc80d80156b (patch) | |
| tree | 438801e16254da7b60c2c73035f129b7142bc255 /bip-0002.mediawiki | |
| parent | ffa91573d2cb349d9322c4d6f775ece23f99027e (diff) | |
| parent | 24eddbb48a1d686f70bf33172de602d865a244b4 (diff) | |
| download | bips-d81cf9da5ee18c9af8f57a63bdb8adc80d80156b.tar.xz | |
Merge branch 'master' into HEAD
Diffstat (limited to 'bip-0002.mediawiki')
| -rw-r--r-- | bip-0002.mediawiki | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bip-0002.mediawiki b/bip-0002.mediawiki index b4567c4..3bf5aec 100644 --- a/bip-0002.mediawiki +++ b/bip-0002.mediawiki @@ -240,7 +240,7 @@ What if a single merchant wishes to block a hard-fork? How about a small number of merchants (maybe only two) who sell products to each other? -* In this scenario, it would seem the previous Bitcoin is alive any working, and that the hard-fork has failed. How to resolve such a split is outside the scope of this BIP. +* In this scenario, it would seem the previous Bitcoin is alive and working, and that the hard-fork has failed. How to resolve such a split is outside the scope of this BIP. How can economic agreement veto a soft-fork? |