fix merge conflict
Failed
Hinrikus Wolf
created pipeline for commit 924c4d12
, finished
1 related merge request: !7 Make systemd journal persistent optional
30 seconds, queued for 3 seconds