Merge branch 'jahway603' into dev

2023-04-03 23:30:32 +00:00
parent d1b649825a 10eb871026
commit 188384cf85
1 changed files with 4 additions and 0 deletions
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2273,6 +2273,10 @@ 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