summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pages/projects/merge_requests/conflicts/index.js
Commit message (Expand)AuthorAgeFilesLines
* refactor merge conflicts bundle to reduce side effectsMike Greiling2018-02-271-2/+5
* remove merge_conflicts bundle in favor of pages directory entry pointMike Greiling2018-02-271-0/+1
* Remove sidebar bundle webpack entry pointClement Ho2018-02-231-0/+3