Skip to content
Snippets Groups Projects
Commit 4e4c16e3 authored by Kirill Schmidt's avatar Kirill Schmidt
Browse files

Fix Merge Conflict

parent 7c8dc2bd
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 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