From 9b62776a8be938892056378868a4d2ff9f7d6d77 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 10 Apr 2019 05:27:06 -1100
Subject: [PATCH] -conflict

---
 src/rpc/crosschain.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/rpc/crosschain.cpp b/src/rpc/crosschain.cpp
index 74ac53c44..0feb5173c 100644
--- a/src/rpc/crosschain.cpp
+++ b/src/rpc/crosschain.cpp
@@ -413,9 +413,9 @@ UniValue selfimport(const UniValue& params, bool fHelp)
     return result;
 }
 
-<<<<<<< HEAD
 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 result(UniValue::VOBJ);
@@ -749,7 +749,6 @@ UniValue importgatewaydumpprivkey(const UniValue& params, bool fHelp)
     //}
     return(ImportGatewayDumpPrivKey(bindtxid,vchSecret));
 }
->>>>>>> FSM
 
 UniValue getNotarisationsForBlock(const UniValue& params, bool fHelp)
 {