Fix for latest merge

This commit is contained in:
romanman 2014-08-07 12:22:20 +03:00
parent c0588237ca
commit 8fcf969533
1 changed files with 1 additions and 1 deletions

View File

@ -209,7 +209,7 @@ public class Blockchain {
if(!blockStateRootHash.equals(worldStateRootHash)){
logger.error("ERROR: STATE CONFLICT! block: {} worldstate {} mismatch", block.getNumber(), worldStateRootHash);
// Last conflict on block 1501 -> worldstate 27920c6c7acd42c8a7ac8a835d4c0e0a45590deb094d6b72a8493fac5d7a3654
repository.close();
// repository.close();
// System.exit(-1); // Don't add block
}
}