summaryrefslogtreecommitdiff
path: root/doc/user/project/merge_requests/img/conflict_section.png
Commit message (Expand)AuthorAgeFilesLines
* Reduce size of images from 25MB to 13MB using pngquantAchilleas Pipinellis2016-11-221-0/+0
* Add merge conflict docsSean McGivern2016-08-121-0/+0