From b3ea78ac620f33b23d62c948e8de98205f6cd46c Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Wed, 3 Jul 2019 15:50:04 -0400
Subject: [PATCH] definen MoneroOutputWallet::merge()

---
 src/wallet/MoneroWalletModel.cpp | 5 +++++
 src/wallet/MoneroWalletModel.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/wallet/MoneroWalletModel.cpp b/src/wallet/MoneroWalletModel.cpp
index b7ffc6c..09a7c7c 100644
--- a/src/wallet/MoneroWalletModel.cpp
+++ b/src/wallet/MoneroWalletModel.cpp
@@ -382,6 +382,11 @@ namespace monero {
     return node;
   }
 
+  void MoneroOutputWallet::merge(const shared_ptr<MoneroOutputWallet>& self, const shared_ptr<MoneroOutputWallet>& other) {
+    cout << "MoneroOutputWallet::merge()" << endl;
+    throw runtime_error("not implemented");
+  }
+
   // ------------------------ MONERO OUTPUT REQUEST ---------------------------
 
   boost::property_tree::ptree MoneroOutputRequest::toPropertyTree() const {
diff --git a/src/wallet/MoneroWalletModel.h b/src/wallet/MoneroWalletModel.h
index c32d849..d71f65e 100644
--- a/src/wallet/MoneroWalletModel.h
+++ b/src/wallet/MoneroWalletModel.h
@@ -161,6 +161,7 @@ namespace monero {
     boost::optional<bool> isFrozen;
 
     boost::property_tree::ptree toPropertyTree() const;
+    void merge(const shared_ptr<MoneroOutputWallet>& self, const shared_ptr<MoneroOutputWallet>& other);
   };
 
   /**