Skip to content
Snippets Groups Projects
Commit ed5c5324 authored by Jarka Kadlecova's avatar Jarka Kadlecova
Browse files

fix wrongly resolved conflict

parent dbe08ae8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 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