From cce5d03dd0f4e8fa3596c9ba5e4d7732eeb704a5 Mon Sep 17 00:00:00 2001
From: Dave Stanke <davidstanke@gmail.com>
Date: Mon, 14 Jan 2019 11:36:12 -0500
Subject: [PATCH] rebase to get new skaffold version

---
 cloudbuild.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 80c017d..8b76515 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -23,11 +23,7 @@ steps:
 
 steps:
 - id: 'Deploy application to cluster'
-<<<<<<< HEAD
   name: 'gcr.io/k8s-skaffold/skaffold:v0.20.0'
-=======
-  name: 'gcr.io/k8s-skaffold/skaffold:v0.18.0'
->>>>>>> Uncomment cluster push
   entrypoint: 'bash'
   args: 
   - '-c'