diff options
| author | Luke Dashjr <luke_github1@dashjr.org> | 2022-09-29 22:30:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-29 22:30:01 +0000 |
| commit | af1587371519ff37c373df975a108fa155aac302 (patch) | |
| tree | a1cf48be725919aa6f04a5c0840e6335accfcad0 | |
| parent | 783d73c0c074181d61c4256f08f70cb0d8e22ea6 (diff) | |
| parent | e6c08f3fac1cb7c2ce67797ff8f671bef9d4097d (diff) | |
| download | bips-af1587371519ff37c373df975a108fa155aac302.tar.xz | |
Merge pull request #1363 from achow101/370-git-conflict
370: Fix merge conflict and typo
| -rw-r--r-- | bip-0370.mediawiki | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/bip-0370.mediawiki b/bip-0370.mediawiki index 872dc17..11b3125 100644 --- a/bip-0370.mediawiki +++ b/bip-0370.mediawiki @@ -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 |