Skip to content
Snippets Groups Projects
Commit 2f7e4baa authored by rudametw's avatar rudametw
Browse files

Clarified merge error

parent 3a3defd7
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment