From f017b3675132ad8f593daa866cbbaf1fee8356b9 Mon Sep 17 00:00:00 2001
From: Donna Dionne <donnadionne@google.com>
Date: Thu, 29 Jan 2015 11:26:57 -0800
Subject: fixing a small conflict

---
 tools/gce_setup/grpc_docker.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/gce_setup/grpc_docker.sh b/tools/gce_setup/grpc_docker.sh
index e0d2683827..53a00b550a 100755
--- 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
-- 
cgit v1.2.3