DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

-conflict

Browse Source
This commit is contained in:
jl777
2019-04-10 05:27:06 -11:00
parent 01db353d61
commit 9b62776a8b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/rpc/crosschain.cpp
View File

@@ -413,9 +413,9 @@ UniValue selfimport(const UniValue& params, bool fHelp)
return result; return result;
} }
<<<<<<< HEAD
bool GetNotarisationNotaries(uint8_t notarypubkeys[64][33], int8_t &numNN, const std::vector<CTxIn> &vin, std::vector<int8_t> &NotarisationNotaries); bool GetNotarisationNotaries(uint8_t notarypubkeys[64][33], int8_t &numNN, const std::vector<CTxIn> &vin, std::vector<int8_t> &NotarisationNotaries);
=======
UniValue importdual(const UniValue& params, bool fHelp) UniValue importdual(const UniValue& params, bool fHelp)
{ {
UniValue result(UniValue::VOBJ); UniValue result(UniValue::VOBJ);
@@ -749,7 +749,6 @@ UniValue importgatewaydumpprivkey(const UniValue& params, bool fHelp)
//} //}
return(ImportGatewayDumpPrivKey(bindtxid,vchSecret)); return(ImportGatewayDumpPrivKey(bindtxid,vchSecret));
} }
>>>>>>> FSM
UniValue getNotarisationsForBlock(const UniValue& params, bool fHelp) UniValue getNotarisationsForBlock(const UniValue& params, bool fHelp)
{ {