From ca36706001c9b514d0beb364cbd5190aff747eae Mon Sep 17 00:00:00 2001
From: jahway603 <jahway603@protonmail.com>
Date: Mon, 3 Apr 2023 19:35:38 -0400
Subject: [PATCH] merge conflicts blow goats

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

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 84b5d1b95..75ca325d0 100644
--- 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