Skip to content
Snippets Groups Projects
Commit 1381dbea authored by Cristian Lalescu's avatar Cristian Lalescu
Browse files

fixes leftover conflict

parent 302b8e47
No related branches found
No related tags found
2 merge requests!48merge develop,!46Feature/warning free
Pipeline #138760 passed
Stage: build
Stage: test
Stage: deploy