diff options
| author |  Donna Dionne <donnadionne@google.com> | 2015-01-29 11:26:57 -0800 |
|---|---|---|
| committer | Donna Dionne <donnadionne@google.com> | 2015-01-29 11:26:57 -0800 |
| commit | f017b3675132ad8f593daa866cbbaf1fee8356b9 (patch) | |
| tree | 0fd75e462260ae6198a57fc003a86c2a963ca23c /tools | |
| parent | 856b0c8b5de721e6fd86a3e26c9f084c5f12208b (diff) | |
fixing a small conflict
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/gce_setup/grpc_docker.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/gce_setup/grpc_docker.sh b/tools/gce_setup/grpc_docker.sh index e0d2683827..53a00b550a 100755 --- a/tools/gce_setup/grpc_docker.sh +++ b/tools/gce_setup/grpc_docker.sh @@ -974,7 +974,4 @@ grpc_cloud_prod_auth_compute_engine_creds_gen_cxx_cmd() { echo $the_cmd } -# TODO(grpc-team): add grpc_interop_gen_xxx_cmd for python|cxx|nodejs -======= -# TODO(grpc-team): add grpc_interop_gen_python_cmd ->>>>>>> 415bca7939809aa5156c7163defc89712b800cb7 +# TODO(grpc-team): add grpc_interop_gen_xxx_cmd for python|nodejs |