fix rebase errors and formatting
Failed
Benjamin Gallois
created pipeline for commit
89bf0d14
, finished
Related merge request !216 to merge 114-offences-testing
3 minutes 8 seconds, queued for 2 seconds