From 7ab015648c8ef9c83b518c2b7967f2bff9bef965 Mon Sep 17 00:00:00 2001
From: Svyatoslav Nikolsky <svyatonik@gmail.com>
Date: Mon, 6 Nov 2017 17:53:45 +0300
Subject: [PATCH] fixed bip16 + SegWit conflict in Network::Unittest

---
 network/src/consensus.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/network/src/consensus.rs b/network/src/consensus.rs
index e77df26b..cce54d82 100644
--- a/network/src/consensus.rs
+++ b/network/src/consensus.rs
@@ -144,7 +144,7 @@ impl ConsensusParams {
 						bit: 1,
 						start_time: 0,
 						timeout: ::std::u32::MAX,
-						activation: Some(0),
+						activation: if network == Network::Regtest { Some(0) } else { None },
 					}),
 					ConsensusFork::BitcoinCash(_) => None,
 				},