Skip to content
Snippets Groups Projects
Commit f017b367 authored by Donna Dionne's avatar Donna Dionne
Browse files

fixing a small conflict

parent 856b0c8b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tools/gce_setup/grpc_docker.sh
+ 1
− 4
View file @ f017b367
...@@ -974,7 +974,4 @@ grpc_cloud_prod_auth_compute_engine_creds_gen_cxx_cmd() { ...@@ -974,7 +974,4 @@ grpc_cloud_prod_auth_compute_engine_creds_gen_cxx_cmd() {
echo $the_cmd echo $the_cmd
} }
# TODO(grpc-team): add grpc_interop_gen_xxx_cmd for python|cxx|nodejs # TODO(grpc-team): add grpc_interop_gen_xxx_cmd for python|nodejs
=======
# TODO(grpc-team): add grpc_interop_gen_python_cmd
>>>>>>> 415bca7939809aa5156c7163defc89712b800cb7
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment