Merge pull request #471 from aionnetwork/master-build-fail

fix PR merge fail and pump version
aionnetwork · May 9, 2018 · 2f8fdfa · 2f8fdfa
2 parents 5ff8814 + 32d914c
commit 2f8fdfa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/modAionImpl/src/org/aion/zero/impl/AionBlockchainImpl.java b/modAionImpl/src/org/aion/zero/impl/AionBlockchainImpl.java
@@ -36,9 +36,11 @@
 import static org.aion.mcf.core.ImportResult.NO_PARENT;
 
 import java.math.BigInteger;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -81,7 +83,6 @@
 import org.aion.zero.impl.core.energy.EnergyStrategies;
 import org.aion.zero.impl.db.AionBlockStore;
 import org.aion.zero.impl.db.AionRepositoryImpl;
-import org.aion.zero.impl.db.RecoveryUtils;
 import org.aion.zero.impl.sync.SyncMgr;
 import org.aion.zero.impl.types.AionBlock;
 import org.aion.zero.impl.types.AionBlockSummary;

diff --git a/modAionImpl/src/org/aion/zero/impl/Version.java b/modAionImpl/src/org/aion/zero/impl/Version.java
@@ -1,7 +1,7 @@
 package org.aion.zero.impl;
 
 public class Version {
-    public static final String KERNEL_VERSION = "0.2.5";
+    public static final String KERNEL_VERSION = "0.2.6";
     public static final String REPO_VERSION = "0.1.0";
     public static final boolean FORK = true;
 }