summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js
Commit message (Expand)AuthorAgeFilesLines
* update remaining uses of CJS syntax to ES module syntaxMike Greiling2017-05-161-8/+7
* remove Vue from the global spaceMike Greiling2017-03-201-2/+2
* Remove .es6 from file extensions (!9241)winniehell2017-03-051-0/+92