Skip to content
Snippets Groups Projects
Commit d10306ed authored by Luca Moser's avatar Luca Moser
Browse files

renames incl. state. conflict to conflicting

parent 4364c8e4
No related branches found
No related tags found
No related merge requests found
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