Merge branch 'dev' into FSM

# Conflicts: # depends/packages/zeromq.mk # src/assetchains.json
2019-03-01 23:01:41 -11:00
parent 7934163db1 b1d6351702
commit 34e2f97d23
4 changed files with 12 additions and 2 deletions
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1030,7 +1030,6 @@ CAmount GetAccountBalance(const string& strAccount, int nMinDepth, const isminef
    return GetAccountBalance(walletdb, strAccount, nMinDepth, filter);
 }

-
 UniValue cleanwallettransactions(const UniValue& params, bool fHelp)
 {
    if (!EnsureWalletIsAvailable(fHelp))