Resolve merge conflicts.
Passed
Mayr, Hannes
created pipeline for commit 56a3a150
, finished
1 related merge request: !64 New year developments
3 minutes 35 seconds, queued for 1 seconds