# Conflicts: # tests/package-lock.json # tests/src/substrate/substrate-api.ts
- Merge branch 'develop' into feature/NFTPAR-268_inregration_test_broken
node/src/chain_spec.rs7.1 KiBsourcehistory# Conflicts: # tests/package-lock.json # tests/src/substrate/substrate-api.ts