small conflict fix

72bf29cb · Donna Dionne · f017b367 · 72bf29cb
Commit 72bf29cb authored 10 years ago by Donna Dionne
--- 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.
 #
 #