diff options
| author |  Noah Eisen <ncteisen@google.com> | 2016-10-12 15:04:45 -0700 |
|---|---|---|
| committer | Noah Eisen <ncteisen@google.com> | 2016-10-12 15:04:45 -0700 |
| commit | cece9c7368cab75444b3c34bb518a98d7f656759 (patch) | |
| tree | 27cf83a0d9244b678d479531f9d32630e0aef727 /templates/composer.json.template | |
| parent | 2cef11c6674e67aea8e7f63f7ac2869e5d44a7c5 (diff) | |
| parent | d44144c3b2112ed61a21c08331bfe9e18664ceb3 (diff) | |
manually fixed merge conflict. caused by the addition of a different new interop test
Diffstat (limited to 'templates/composer.json.template')
| -rw-r--r-- | templates/composer.json.template | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/composer.json.template b/templates/composer.json.template index 48d3b8892e..3b4d62f24d 100644 --- a/templates/composer.json.template +++ b/templates/composer.json.template @@ -9,7 +9,8 @@ "license": "BSD-3-Clause", "require": { "php": ">=5.5.0", - "stanley-cheung/protobuf-php": "v0.6" + "ext-grpc": "*", + "google/protobuf": "v3.1.0-alpha-1" }, "require-dev": { "google/auth": "v0.9" |