fix

Signed-off-by: YujiOshima <yuji.oshima0x3fd@gmail.com>
kubeflow · May 15, 2018 · a72f0ed · a72f0ed
1 parent 9bad650
commit a72f0ed
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/test/scripts/build.sh b/test/scripts/build.sh
@@ -50,7 +50,6 @@ pids+=($!)
 sleep 30 # wait for copy code to gcloud
 
 cp cmd/suggestion/grid/Dockerfile .
-<<<<<<< HEAD
 gcloud container builds submit . --tag=${REGISTRY}/${REPO_NAME}/suggestion-grid:${VERSION} --project=${PROJECT} &
 pids+=($!)
 sleep 30 # wait for copy code to gcloud