summaryrefslogtreecommitdiff
path: root/doc/user/project/merge_requests/img/conflict_section.png
diff options
context:
space:
mode:
Diffstat (limited to 'doc/user/project/merge_requests/img/conflict_section.png')
-rw-r--r--doc/user/project/merge_requests/img/conflict_section.pngbin247537 -> 72815 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/conflict_section.png b/doc/user/project/merge_requests/img/conflict_section.png
index 842e50b14b2..cfc17013218 100644
--- a/doc/user/project/merge_requests/img/conflict_section.png
+++ b/doc/user/project/merge_requests/img/conflict_section.png
Binary files differ