Skip to content

Commit 6c73f31

Browse files
committed
Merge branch 'develop' of github.com:magento-gl/magento-semver into AC-2841
Conflicts: composer.lock
2 parents 0226a35 + 98eb6df commit 6c73f31

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"ext-json": "*",
1313
"laminas/laminas-dependency-plugin": "^2.2.0",
1414
"laminas/laminas-stdlib": "~3.6.0",
15-
"nikic/php-parser": "~4.12.0",
15+
"nikic/php-parser": "^4.15",
1616
"phpstan/phpdoc-parser": "^0.5.5",
1717
"sabre/xml": "~2.2.3",
1818
"symfony/console": "~4.4.0||~5.4.0",

composer.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)