summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6
Commit message (Expand)AuthorAgeFilesLines
* Refactor JS codeAlfredo Sumaran2016-10-131-0/+30