diff options
| -rw-r--r-- | README.mediawiki | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/README.mediawiki b/README.mediawiki index 1f8ef4d..6949512 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -254,15 +254,15 @@ Those proposing changes should consider that ultimately consent may rest with th | Standard | Draft |- -<<<<<<< HEAD -| [[bip-0069.mediawiki|69]] -| Lexicographical Indexing of Transaction Inputs and Outputs -| Kristov Atlas -======= | [[bip-0068.mediawiki|68]] | Consensus-enforced transaction replacement signalled via sequence numbers | Mark Friedenbach ->>>>>>> bitcoin/master +| Standard +| Draft +|- +| [[bip-0069.mediawiki|69]] +| Lexicographical Indexing of Transaction Inputs and Outputs +| Kristov Atlas | Standard | Draft |- @@ -297,4 +297,4 @@ Those proposing changes should consider that ultimately consent may rest with th | Draft |} -<!-- IMPORTANT! See the instructions at the top of this page, do NOT JUST add BIPs here! --> +<!-- IMPORTANT! See the instructions at the top of this page, do NOT JUST add BIPs here! -->
\ No newline at end of file |