# Conflicts: # tests/package.json
Feature/nftpar 235 258
- tests fixes
- Merge branch 'develop' into feature/NFTPAR-288
- transferFrom tests
# Conflicts: # tests/src/createCollection.test.ts # tests/src/util/helpers.ts
- Fix transferFrom
tests/src/approve.test.ts6.9 KiBsourcehistory# Conflicts: # tests/package.json
Feature/nftpar 235 258
# Conflicts: # tests/src/createCollection.test.ts # tests/src/util/helpers.ts