From 4b75b5d0b59615ec069669169dbb28a1125c80eb Mon Sep 17 00:00:00 2001
From: Dave Stanke <davidstanke@gmail.com>
Date: Tue, 8 Jan 2019 12:15:25 -0500
Subject: [PATCH] Uncomment cluster push

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

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 8b76515..80c017d 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -23,7 +23,11 @@ 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'