Skip to content

Commit a489392

Browse files
Manjusha.SManjusha.S
Manjusha.S
authored and
Manjusha.S
committed
resolved conflicts
2 parents 46a70c7 + 919b2c3 commit a489392

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

‎CHANGELOG.md

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Magento Functional Testing Framework Changelog
1010
* Fixed links in docs
1111

1212

13-
1413
3.10.1
1514
---------
1615

‎composer.lock

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)