summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pages/projects/merge_requests/conflicts
ModeNameSize
-rw-r--r--index.js239logplain