Commit dde9b669 authored by Clement Ho's avatar Clement Ho

Fix webpack config conflict

parent b0a9a7cf
...@@ -33,11 +33,6 @@ var config = { ...@@ -33,11 +33,6 @@ var config = {
graphs: './graphs/graphs_bundle.js', graphs: './graphs/graphs_bundle.js',
group: './group.js', group: './group.js',
groups_list: './groups_list.js', groups_list: './groups_list.js',
<<<<<<< HEAD
issuable: './issuable/issuable_bundle.js',
=======
issues: './issues/issues_bundle.js',
>>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master
issue_show: './issue_show/index.js', issue_show: './issue_show/index.js',
main: './main.js', main: './main.js',
merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment