summaryrefslogtreecommitdiff
path: root/bip-0002.mediawiki
diff options
context:
space:
mode:
authorLuke Dashjr <luke_github1@dashjr.org>2019-07-23 14:51:57 +0000
committerGitHub <noreply@github.com>2019-07-23 14:51:57 +0000
commitac75b1dcf5897299f9f06e56060e5807e41f7562 (patch)
tree1bfdac8144688336841e18b2ab58e2aa8e774c76 /bip-0002.mediawiki
parent6a25c1478fa54fc873a3530c60841d8c5cd6c3d5 (diff)
parent14834fa63c9de42140d1d70ed6dab0837a202186 (diff)
downloadbips-ac75b1dcf5897299f9f06e56060e5807e41f7562.tar.xz
Merge pull request #777 from dergigi/dergigi-patch-1-bip-typos
[Trivial] BIP2, BIP16: fix typos
Diffstat (limited to 'bip-0002.mediawiki')
-rw-r--r--bip-0002.mediawiki2
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?