-<<<<<

2018-08-24 14:02:45 -11:00
parent 7cb141476c
commit d2eccba5a5
1 changed files with 0 additions and 4 deletions
--- 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"),