Fixed missed merge

publiclab · Apr 7, 2019 · 6223a92 · 6223a92
1 parent 149e4e3
commit 6223a92
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -1,5 +1,4 @@
 steps:
-<<<<<<< HEAD
 - name: 'docker/compose:1.19.0'
   args: ['up', '-d']
 - name: 'gcr.io/cloud-builders/docker'
@@ -13,9 +12,3 @@ steps:
 # Note that this build pushes this image.
 images: ['gcr.io/$PROJECT_ID/mapknitter-dev']
 timeout: 2200s
-=======
-  - name: 'docker/compose:1.19.0'
-    args: ['up', '-d']
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['tag', 'mapknitter-dev:latest', 'gcr.io/public-lab/mapknitter-dev']
->>>>>>> Changes to be able to build container in Google Cloud