Merge fixes

2018-12-04 01:47:06 -11:00
parent c7b89e39b2 f5e142203e
commit 36b8e1afdc
3 changed files with 10 additions and 7 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)
 {