Skip to content
Snippets Groups Projects
Commit 2b7ac96e authored by Yaroslav Yermak's avatar Yaroslav Yermak
Browse files

fixed incorrect merge

parent 69f64c12
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 24 deletions
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