Skip to content
Snippets Groups Projects
Commit ea016a5c authored by mkirsz's avatar mkirsz
Browse files

resolved conflict

parents 899544e5 bb527f8c
No related branches found
No related tags found
1 merge request!8Develop
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 1 deletion
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