resolved conflict with 'develop' of https://github.com/mbg033/monero

2016-10-07 00:36:36 +03:00
parent 62b3708ea5 bb9094f1fe
commit a4390dae07
1 changed files with 0 additions and 3 deletions
--- a/src/wallet/api/transaction_history.cpp
+++ b/src/wallet/api/transaction_history.cpp
@@ -207,6 +207,3 @@ void TransactionHistoryImpl::refresh()
    }
 }

-
-
-}