Resolved conflicts found during merge

1 job for bug#238 in 0 seconds (queued for 26 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:00:09