From d2eccba5a57a84e9588934fa9476f61f5899989c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 24 Aug 2018 14:02:45 -1100
Subject: [PATCH] -<<<<<

---
 src/main.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index c94d48c92..bc409f635 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1123,10 +1123,6 @@ bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidatio
         }
         if ( txout.scriptPubKey.size() > IGUANA_MAXSCRIPTSIZE )
             return state.DoS(100, error("CheckTransaction(): txout.scriptPubKey.size() too big"),REJECT_INVALID, "bad-txns-vout-negative");
-<<<<<<< HEAD
-  
-=======
->>>>>>> jl777
         nValueOut += txout.nValue;
         if (!MoneyRange(nValueOut))
             return state.DoS(100, error("CheckTransaction(): txout total out of range"),