diff options
Diffstat (limited to 'doc/user/project/merge_requests/img/conflict_ui_v15_6.png')
-rw-r--r-- | doc/user/project/merge_requests/img/conflict_ui_v15_6.png | bin | 13672 -> 14089 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/conflict_ui_v15_6.png b/doc/user/project/merge_requests/img/conflict_ui_v15_6.png Binary files differindex baa1cda3104..d5d5ad14edb 100644 --- a/doc/user/project/merge_requests/img/conflict_ui_v15_6.png +++ b/doc/user/project/merge_requests/img/conflict_ui_v15_6.png |