yh

4 months ago · 8f6768ca2c
parent eec6de9341
commit 8f6768ca2c
1 changed files with 0 additions and 4 deletions
--- a/composer.json
+++ b/composer.json
@ -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": {