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

Merge branch 'conflict-resolution-refactor' into 'master'

Conflict resolution refactor

See merge request gitlab-org/gitlab-ce!14747
parents 3a7623fc 9fdde369
No related branches found
No related tags found
No related merge requests found
Showing
with 339 additions and 273 deletions
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