Skip to content
Commit 08d99886 authored by Tereza Vrabcova's avatar Tereza Vrabcova
Browse files

fix merge issue

parents 7445f596 e96faee3
Hide whitespace changes
Inline Side-by-side
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