Draft: Resolve #3283651 "Guzzle6 adapter" (!15) · Merge requests · project / geocoder · GitLab

Snippets Groups Projects

Closed Claudiu Cristea requested to merge issue/geocoder-3283651:3283651-guzzle6-adapter into 8.x-3.x 3 years ago

Compare and

1 file

+ 0

− 1

Conflict: This file was modified in both the source and target branches. Ask someone with write access to resolve it.

composer.json

+ 0

− 1

@@ -25,7 +25,6 @@
@@ -25,7 +25,6 @@
    },
    },
    "require": {
    "require": {
        "php": ">=7.1.0",
        "php": ">=7.1.0",
        "php-http/guzzle6-adapter": "^1.1 || ^2.0",
        "php-http/message": "^1.6",
        "php-http/message": "^1.6",
        "willdurand/geocoder": "^4.0",
        "willdurand/geocoder": "^4.0",
        "davedevelopment/stiphle": "^0.9.2"
        "davedevelopment/stiphle": "^0.9.2"