merged conflicts manually

2019-10-21 22:43:58 +02:00
parent e3f29d8183 f9beda0ded
commit d4233dc00b
1 changed files with 0 additions and 1 deletions
--- a/src/liteinterface.cpp
+++ b/src/liteinterface.cpp
@@ -56,7 +56,6 @@ void LiteInterface::fetchPrivKey(QString addr, const std::function<void(json)>&
    conn->doRPCWithDefaultErrorHandling("export", addr, cb);
 }

-
 void LiteInterface::fetchBalance(const std::function<void(json)>& cb) {
    if (conn == nullptr)
        return;