Skip to content

Commit fb3d20f

Browse files
committed
Use my own php-merge fork
1 parent e39e9b7 commit fb3d20f

File tree

2 files changed

+61
-58
lines changed

2 files changed

+61
-58
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"require": {
88
"php": "^8.1",
99
"composer-runtime-api": "^2.0",
10-
"bircher/php-merge": "^4.0",
1110
"clue/ndjson-react": "^1.0",
1211
"composer/ca-bundle": "^1.2",
1312
"composer/semver": "^3.4",
@@ -27,6 +26,7 @@
2726
"ondram/ci-detector": "^3.4.0",
2827
"ondrejmirtes/better-reflection": "6.57.0.0",
2928
"ondrejmirtes/composer-attribute-collector": "^1.0.0",
29+
"ondrejmirtes/php-merge": "^4.1",
3030
"phpstan/php-8-stubs": "0.4.12",
3131
"phpstan/phpdoc-parser": "2.1.0",
3232
"psr/http-message": "^1.1",

composer.lock

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

0 commit comments

Comments
 (0)