fix merge conflicts
This commit is contained in:
commit
1d01d79be0
1 changed files with 3 additions and 3 deletions
|
|
@ -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:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue