rebase to get new skaffold version

This commit is contained in:
Dave Stanke 2019-01-14 11:36:12 -05:00
parent 4b75b5d0b5
commit 9e21590f0d

View file

@ -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'