|
|
|
|
@ -1,12 +1,8 @@
|
|
|
|
|
{
|
|
|
|
|
"require": {
|
|
|
|
|
"rodneyrehm/plist": "^2.0",
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
"guzzlehttp/guzzle": "~6.0"
|
|
|
|
|
=======
|
|
|
|
|
"guzzlehttp/guzzle": "~6.0",
|
|
|
|
|
"obs/esdk-obs-php": "3.22.6"
|
|
|
|
|
>>>>>>> a2bb9f000757e13fa3ca589d6763340af1fcf41a
|
|
|
|
|
},
|
|
|
|
|
"repositories": {
|
|
|
|
|
"packagist": {
|
|
|
|
|
|
