Commit e419701a authored by Håvard Hunshamar's avatar Håvard Hunshamar

Resolved merge conflict #2

parent 28b5a94b
Pipeline #25155 failed with stage
in 3 minutes and 2 seconds