From b08d57ca4828b1841284da986c218953c46451b7 Mon Sep 17 00:00:00 2001
From: ca333 <ca333@users.noreply.github.com>
Date: Sat, 19 Jan 2019 19:00:26 +0100
Subject: [PATCH] resolve conflict

jl777:master->komodoplatform:master
---
 src/chainparams.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index af82f3a35..02b73f04b 100644
--- 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;