attempt to fix merge conflict
Passed
csph pipeline user for git.conesphere.cloud pipeline alerts
created pipeline for commit
0788b44f
, finished
1 related merge request: !4 Update Containerfile
2 jobs
3 minutes 27 seconds, queued for 5 seconds