diff options
author | Ilya Kitaev <mbg033@gmail.com> | 2016-10-07 00:36:36 +0300 |
---|---|---|
committer | Ilya Kitaev <mbg033@gmail.com> | 2016-10-07 00:36:36 +0300 |
commit | a4390dae07bd29ebb6d74fa16d231b8e09f5d027 (patch) | |
tree | b466a1deacdbdc57bc313d7a95ddc7a699da7fc8 /src/wallet | |
parent | libwallet_api: do not signal on sent/received tx until wallet completely (diff) | |
parent | libwallet_api: fixes for transaction history (diff) | |
download | monero-a4390dae07bd29ebb6d74fa16d231b8e09f5d027.tar.xz |
resolved conflict with 'develop' of https://github.com/mbg033/monero
Diffstat (limited to 'src/wallet')
-rw-r--r-- | src/wallet/api/transaction_history.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/wallet/api/transaction_history.cpp b/src/wallet/api/transaction_history.cpp index df495591f..fa939c08c 100644 --- a/src/wallet/api/transaction_history.cpp +++ b/src/wallet/api/transaction_history.cpp @@ -207,6 +207,3 @@ void TransactionHistoryImpl::refresh() } } - - -} |