forked from Qortal/qortal
# Conflicts: # src/main/java/org/qortal/block/BlockChain.java # src/main/java/org/qortal/controller/OnlineAccountsManager.java # src/main/java/org/qortal/network/message/BlockV2Message.java # src/main/resources/blockchain.json # src/test/resources/test-chain-v2.json