diff options
Diffstat (limited to 'doc/user/project/merge_requests/img/merge_conflict_editor.png')
-rw-r--r-- | doc/user/project/merge_requests/img/merge_conflict_editor.png | bin | 50422 -> 50286 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/merge_conflict_editor.png b/doc/user/project/merge_requests/img/merge_conflict_editor.png Binary files differindex 6660920c191..f10efbce5f5 100644 --- a/doc/user/project/merge_requests/img/merge_conflict_editor.png +++ b/doc/user/project/merge_requests/img/merge_conflict_editor.png |