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

370: Fix merge conflict and typo

Author: luke-jr

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