Skip to content
Snippets Groups Projects
Commit da8edafb authored by Irina Kera Gundersen's avatar Irina Kera Gundersen
Browse files

fix merge conflict

parents a14de7c1 98e4b38e
Branches testing
No related tags found
2 merge requests!11Testing,!10Testing
Pipeline #116931 passed
Stage: test-frontend
Stage: test-backend