From 1fbadaabde6db4028a6b3c5013003a3c7a3ba1b2 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Thu, 22 Aug 2019 13:09:11 -0400
Subject: [PATCH] don't implement monero_output_wallet::merge() yet

---
 src/wallet/monero_wallet_model.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wallet/monero_wallet_model.cpp b/src/wallet/monero_wallet_model.cpp
index f11a38d..7633ca1 100644
--- a/src/wallet/monero_wallet_model.cpp
+++ b/src/wallet/monero_wallet_model.cpp
@@ -566,6 +566,7 @@ namespace monero {
   }
 
   void monero_output_wallet::merge(const shared_ptr<monero_output_wallet>& self, const shared_ptr<monero_output_wallet>& other) {
+    throw runtime_error("monero_output_wallet:merge() not implemented");
     MTRACE("monero_output_wallet::merge(self, other)");
     if (this != self.get()) throw runtime_error("this != self");
     if (self == other) return;