Skip to content
Snippets Groups Projects
Commit 2a3f3f85 authored by Nigel Kukard's avatar Nigel Kukard
Browse files

Only re-activate conflicted conflicts

parent 4812b87b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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