resolve conflict

jl777:master->komodoplatform:master
2019-01-19 19:00:26 +01:00
parent a47ba0cf7a
commit b08d57ca48
1 changed files with 2 additions and 1 deletions
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -92,7 +92,8 @@ public:

        strNetworkID = "main";
        strCurrencyUnits = "KMD";
-        bip44CoinType = 141; // As registered in https://github.com/satoshilabs/slips/blob/master/slip-0044.md (ZCASH, should be VRSC)
+        bip44CoinType = 141; // As registered in https://github.com/satoshilabs/slips/blob/master/slip-0044.md 
+
        consensus.fCoinbaseMustBeProtected = false; // true this is only true wuth Verus and enforced after block 12800
        consensus.nSubsidySlowStartInterval = 20000;
        consensus.nSubsidyHalvingInterval = 840000;