# Conflicts: # tests/package-lock.json # tests/src/substrate/substrate-api.ts
- Merge branch 'develop' into feature/NFTPAR-288
Feature/nftpar 288
tests/src/addCollectionAdmin.test.ts6.0 KiBsourcehistory# Conflicts: # tests/package-lock.json # tests/src/substrate/substrate-api.ts
Feature/nftpar 288