From 72bf29cbba62944edd35a256fd5d885c7f83985b Mon Sep 17 00:00:00 2001
From: Donna Dionne <donnadionne@google.com>
Date: Thu, 29 Jan 2015 11:32:21 -0800
Subject: [PATCH] small conflict fix
---
tools/gce_setup/grpc_docker.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/gce_setup/grpc_docker.sh b/tools/gce_setup/grpc_docker.sh
index 53a00b550a..a97cc88aee 100755
--- 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.
#
#
--
GitLab