From f4b72504c131f1751cf0f39986d2c20c72a389b0 Mon Sep 17 00:00:00 2001 From: Srdjan Obucina Date: Mon, 24 Feb 2020 13:57:20 +0100 Subject: [PATCH] Resolve conflicts --- .../graphene/peerplays_sidechain/sidechain_net_handler.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp index 64fea1be..fe042306 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp @@ -36,8 +36,6 @@ protected: virtual std::string transfer( const std::string& from, const std::string& to, const uint64_t amount ) = 0; virtual std::string sign_transaction( const std::string& transaction ) = 0; virtual std::string send_transaction( const std::string& transaction ) = 0; - //virtual std::string transfer_deposit_to_primary_wallet (const sidechain_event_data& sed) = 0; - //virtual std::string transfer_withdrawal_from_primary_wallet(const std::string& user_address, double sidechain_amount) = 0; private: