# Conflicts: # tests/package-lock.json # tests/src/substrate/substrate-api.ts
- Merge branch 'develop' into feature/NFTPAR-288
Feature/nftpar 234
Feature/nftpar 257
tests/src/substrate/get-balance.ts637 Bsourcehistory# Conflicts: # tests/package-lock.json # tests/src/substrate/substrate-api.ts
Feature/nftpar 234
Feature/nftpar 257