Merge pull request 'merge conflicts blow goats' (#280) from jahway603 into dev

Reviewed-on: #280
1 year ago · ca26403c4a
1 changed files with 0 additions and 4 deletions
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@ -2273,10 +2273,6 @@ int64_t CWalletTx::GetTxTime() const
    return n ? n : nTimeReceived;
 }

-<<<<<<< HEAD
-
-=======
->>>>>>> origin/dev
 // GetAmounts will determine the transparent debits and credits for a given wallet tx.
 void CWalletTx::GetAmounts(list<COutputEntry>& listReceived,
                           list<COutputEntry>& listSent, CAmount& nFee, string& strSentAccount, const isminefilter& filter) const