highperfocused/bips
1
0
Fork 0
mirror of https://github.com/bitcoin/bips.git synced 2025-03-17 21:32:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1363 from achow101/370-git-conflict

Browse Source 
370: Fix merge conflict and typo
This commit is contained in:
Luke Dashjr 2022-09-29 22:30:01 +00:00 committed by GitHub
commit af15873715
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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>
| None
| No key data
<<<<<<< HEAD
| <tt><32-bit uiht></tt>
| <tt><32-bit uint locktime></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.
||||||| 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
| 2