Skip to content
Snippets Groups Projects
Commit de87c6f6 authored by Sean McGivern's avatar Sean McGivern
Browse files

Merge branch '21135-resolve-these-conflicts-link-is-too-subtle' into 'master' 

Replace link to Resolve conflicts with buttons

Closes #21135

See merge request !8229
parents ac3789d2 822534c4
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