From e6c08f3fac1cb7c2ce67797ff8f671bef9d4097d Mon Sep 17 00:00:00 2001
From: Andrew Chow <github@achow101.com>
Date: Thu, 1 Sep 2022 13:04:00 -0400
Subject: [PATCH] 370: Fix merge conflict and typo

---
 bip-0370.mediawiki | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/bip-0370.mediawiki b/bip-0370.mediawiki
index 8519473c..2d07460e 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