forked from Qortal/qortal
241e2bef85
# Conflicts: # src/main/java/org/qortal/block/BlockChain.java # src/main/resources/blockchain.json # src/test/resources/test-chain-v2-founder-rewards.json # src/test/resources/test-chain-v2-leftover-reward.json # src/test/resources/test-chain-v2-minting.json # src/test/resources/test-chain-v2-qora-holder-extremes.json # src/test/resources/test-chain-v2-qora-holder.json # src/test/resources/test-chain-v2-reward-scaling.json # src/test/resources/test-chain-v2.json