fix merge conflicts

This commit is contained in:
Bert van der Weerd 2023-02-16 13:22:30 +01:00
commit 1d01d79be0
No known key found for this signature in database
GPG key ID: 73370A0B9E5516B0

View file

@ -3,12 +3,12 @@ stages:
- build - build
- release - release
# Notes; we want short labes so we can see what is what, and
# allow image builds on all branches because don't wan to
# deal with them on the master branch
Images: Images:
stage: images stage: images
when: manual when: manual
only:
- master
- flatpak-appimage
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
tags: [autoscale] tags: [autoscale]
parallel: parallel: