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
Checking pipeline status
Show whitespace changes
Inline Side-by-side
Showing
with 7 additions and 21 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment