diff options
| author | Kristov Atlas <kristovatlas@gmail.com> | 2015-08-18 17:43:46 -0400 |
|---|---|---|
| committer | Kristov Atlas <kristovatlas@gmail.com> | 2015-08-18 17:43:46 -0400 |
| commit | 5f07cd0d18428b32174f352f9bb525dc9807bacf (patch) | |
| tree | af76eaf27176eeee69d22296dc469cd6b54fe871 | |
| parent | 0ec82c9c8f19f645afc70cef40e2ae53d966a6dd (diff) | |
| download | bips-5f07cd0d18428b32174f352f9bb525dc9807bacf.tar.xz | |
trying to fix git mixup with bip68
| -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 |