Skip to content
Snippets Groups Projects
Commit 7f26883c authored by Marco Clemencic's avatar Marco Clemencic
Browse files

fix typo in confict resolution (67669c14)

parent 5c4b4e0f
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment