# Conflicts: # tests/src/createCollection.test.ts # tests/src/util/helpers.ts
- Fix transferFrom
- approve and transferFrom test scenarios
- Merge branch 'develop' into feature/NFTPAR-235-258
- approve and transferFrom test scenarios
tests/src/approve.test.ts7.7 KiBsourcehistory# Conflicts: # tests/src/createCollection.test.ts # tests/src/util/helpers.ts