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

fixed merge conflict

parents 10ee1f6f 48a79f14
No related branches found
No related tags found
1 merge request!7Feature/menu
Pipeline #273582 failed