fixing a small conflict

10 years ago · f017b36751
parent 856b0c8b5d
commit f017b36751
1 changed files with 1 additions and 4 deletions
--- 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