Fix merge error

ethereum · Aug 16, 2017 · 51806a2 · 51806a2
1 parent 8f1fddb
commit 51806a2
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/ethereumj-core/src/main/java/org/ethereum/config/blockchain/ByzantiumConfig.java b/ethereumj-core/src/main/java/org/ethereum/config/blockchain/ByzantiumConfig.java
@@ -61,6 +61,7 @@ protected int getExplosion(BlockHeader curBlock, BlockHeader parent) {
     public BigInteger getCalcDifficultyMultiplier(BlockHeader curBlock, BlockHeader parent) {
         long unclesAdj = parent.hasUncles() ? 2 : 1;
         return BigInteger.valueOf(Math.max(unclesAdj - (curBlock.getTimestamp() - parent.getTimestamp()) / 9, -99));
+    }
 
     @Override
     public boolean eip140() {