forked from Qortal/qortal
# Conflicts: # src/main/java/org/qortal/block/Block.java # src/main/java/org/qortal/controller/OnlineAccountsManager.java
# Conflicts: # src/main/java/org/qortal/block/Block.java # src/main/java/org/qortal/controller/OnlineAccountsManager.java