# Conflicts:
#	source/base/src/main/java/com/jd/blockchain/consts/DataCodes.java
#	source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JavaContractCode.java
#	source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionBatchProcessor.java
#	source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditerTest.java
#	source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationBase.java