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

fix: fixed merge conflict

parents c260835f c80d30d2
No related branches found
No related tags found
1 merge request!44Fix/pipeline
Pipeline #279500 failed