Skip to content
Snippets Groups Projects
Commit 844be4e6 authored by Marius Dumitru Florea's avatar Marius Dumitru Florea
Browse files

XWIKI-7649: Introduce document merge conflict resolution UI 

* Don't hide the entire progress log after resolving a merge conflict.
parent 92857253
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