mirrors/bitcoin-bips
1
0
Fork 0
mirror of https://github.com/bitcoin/bips.git synced 2024-11-19 01:40:05 +01:00
Code Issues Projects Releases Wiki Activity

370: Fix merge conflict and typo

Browse Source
This commit is contained in:
Andrew Chow 2022-09-01 13:04:00 -04:00
parent 52f68fecd8
commit e6c08f3fac
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bip-0370.mediawiki
View File

@ -166,16 +166,8 @@ The new per-input types for PSBT Version 2 are defined as follows:
| <tt>PSBT_IN_REQUIRED_HEIGHT_LOCKTIME = 0x12</tt> | <tt>PSBT_IN_REQUIRED_HEIGHT_LOCKTIME = 0x12</tt>
| None | None
| No key data | No key data
<<<<<<< HEAD | <tt><32-bit uint locktime></tt>
| <tt><32-bit uiht></tt>
| 32 bit unsigned little endian integer greater than 0 and less than 500000000 representing the minimum block height that this input requires to be set as the transaction's lock time. | 32 bit unsigned little endian integer greater than 0 and less than 500000000 representing the minimum block height that this input requires to be set as the transaction's lock time.
||||||| b505101a
| <tt><32-bit uiht></tt>
| 32 bit unsigned little endian integer less than 500000000 representing the minimum block height that this input requires to be set as the transaction's lock time.
=======
| <tt><32-bit uiht locktime></tt>
| 32 bit unsigned little endian integer less than 500000000 representing the minimum block height that this input requires to be set as the transaction's lock time.
>>>>>>> origin-pull/1345/head
| |
| 0 | 0
| 2 | 2