Skip to content
Snippets Groups Projects
Commit 776297e3 authored by Anders Høvik's avatar Anders Høvik
Browse files

Fix: fixed merge conflict

parents 865a72f9 dfb74388
No related branches found
No related tags found
1 merge request!44Fix/pipeline
Pipeline #279582 failed