Merge branch 'FSM' of https://github.com/jl777/komodo

fix
2018-12-13 12:40:53 +08:00
parent 5ced63c9c9 e719e66630
commit 7349a49641
34 changed files with 874 additions and 1875 deletions
--- a/src/rpcblockchain.old
+++ b/src/rpcblockchain.old
@@ -33,7 +33,10 @@ extern void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue&
 void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex);
 int32_t komodo_longestchain();
 int32_t komodo_dpowconfs(int32_t height,int32_t numconfs);
+<<<<<<< HEAD:src/rpcblockchain.old
 extern int32_t KOMODO_LONGESTCHAIN;
+=======
+>>>>>>> master:src/rpcblockchain.cpp

 double GetDifficultyINTERNAL(const CBlockIndex* blockindex, bool networkDifficulty)
 {