Skip to content
Commit 5dff9d88 authored by Vincent Petry's avatar Vincent Petry
Browse files

Make sure the conflict dialog is loaded before adding conflicts

parent 3dec30d0
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