Commit 4d0e9f8a authored by barrystyle's avatar barrystyle

remove lock on testnet, and fix merge_logo_horizontal

parent 226ba871
......@@ -209,10 +209,6 @@ public:
// assert(hashGenesisBlock == uint256("0x00000ee868e0bd2539f2c9d11282926a15b388f591d295c638049c2a1feaa1f0"));
assert(hashGenesisBlock == uint256("000008856503aafffd8e4e638efcc332409e57169b427e6cbcee7d47fd5b7f8b"));
// prevent testnet from existing for more than 7 days
/* if (GetTime() > genesis.nTime + (7 * 86400))
exit(0); */
vFixedSeeds.clear();
vSeeds.clear();
......
......@@ -110,7 +110,7 @@ CBaseChainParams::Network NetworkIdFromCommandLine()
return CBaseChainParams::REGTEST;
if (fTestNet)
return CBaseChainParams::TESTNET;
return CBaseChainParams::TESTNET; // temp hardlocked testnet
return CBaseChainParams::MAIN;
}
bool SelectBaseParamsFromCommandLine()
......
......@@ -1213,7 +1213,7 @@ min-height:100px;
margin-right:20px;
margin-left:0;
margin-top:0;
background-image: url(':/images/MERGE_logo_horizontal');
background-image: url(':/images/merge_logo_horizontal');
background-repeat:none;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment