small conflict fix

10 years ago · 72bf29cbba
parent f017b36751
commit 72bf29cbba
1 changed files with 0 additions and 1 deletions
--- a/tools/gce_setup/grpc_docker.sh
+++ b/tools/gce_setup/grpc_docker.sh
@ -943,7 +943,6 @@ grpc_cloud_prod_gen_cxx_cmd() {
    echo $the_cmd
 }

-<<<<<<< HEAD
 # constructs the full dockerized cpp interop test cmd.
 #
 #