Skip to content

Commit bee4382

Browse files
Manjusha.SManjusha.S
Manjusha.S
authored and
Manjusha.S
committed
resolved conflicts
2 parents 75ed840 + 23a85f5 commit bee4382

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Diff for: composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"codeception/module-asserts": "^1.1",
2323
"codeception/module-sequence": "^1.0",
2424
"codeception/module-webdriver": "^1.0",
25-
"composer/composer": "^1.9||^2.0",
25+
"composer/composer": "^1.9 || ^2.0, !=2.2.16",
2626
"csharpru/vault-php": "^4.2.1",
2727
"guzzlehttp/guzzle": "^7.3.0",
2828
"laminas/laminas-diactoros": "^2.8",

Diff for: composer.lock

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

0 commit comments

Comments
 (0)