mirzaev
/
vk
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправления

This commit is contained in:
Arsen Mirzaev Tatyano-Muradovich 2021-03-10 12:11:07 +10:00
parent b769c682d1
commit 3703a61e5c
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.json
View File

@ -28,17 +28,6 @@
}, },
"require": { "require": {
"php": "~8.0", "php": "~8.0",
<<<<<<< HEAD
"psr/log": "^1.0",
"monolog/monolog": "^1.6",
"jasny/error-handler": "^0.2.0",
"hood/accounts": "0.*",
"guzzlehttp/guzzle": "^7.2"
},
"require-dev": {
"phpdocumentor/phpdocumentor": ">=2.9",
"phpunit/phpunit": "^9"
=======
"psr/log": "~1.0", "psr/log": "~1.0",
"hood/accounts": "~0.1.x-dev", "hood/accounts": "~0.1.x-dev",
"monolog/monolog": "~1.6", "monolog/monolog": "~1.6",
@ -47,7 +36,6 @@
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~9.5" "phpunit/phpunit": "~9.5"
>>>>>>> a45b5c327511a74d1fae5ab0e3a1dcc68e7dc3b4
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {