Merge pull request #23 from nitsujlangston/cleanup/duplicateTestnetSegwit2xDeployment

Cleaning up duplicate testnet segwit2x deployment block

Author: jgarzik

src/chainparams.cpp

@@ -212,11 +212,6 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT2X].nStartTime = 1496275200; // June 1, 2017.
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT2X].nTimeout = 1510704000; // November 15th, 2017
 
-        // Deployment of SegWit2x
-        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT2X].bit = 4;
-        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT2X].nStartTime = 1496275200; // June 1st, 2017.
-        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT2X].nTimeout = 1510704000; // November 15th, 2017.
-
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000000000000000100");