Skip to content
Snippets Groups Projects
Commit 6a9dd1f4 authored by Eline Evje's avatar Eline Evje
Browse files

chore: fixed merge conflict

parent 70a32d14
No related branches found
No related tags found
3 merge requests!66Final merge,!47Feat/implement genereated challenges modal,!4Pipeline fix
Pipeline #282364 failed
Stage: install
Stage: lint_and_format
Stage: build
Stage: test
Stage: security_scan
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment