summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts/components/_parallel_conflict_line.html.haml
Commit message (Expand)AuthorAgeFilesLines
* Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-131-0/+10