bitcoin/bips
1
0
Fork 0
mirror of https://github.com/bitcoin/bips.git synced 2025-05-12 12:03:29 +00:00
Code Issues Releases Wiki Activity

trying to fix git mixup with bip68

Browse Source
This commit is contained in:
Kristov Atlas 2015-08-18 17:43:46 -04:00
parent 0ec82c9c8f
commit 5f07cd0d18
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.mediawiki
View File

@ -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
|-