kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix webpack config conflict

Browse source
This commit is contained in:
Clement Ho 2017-05-04 10:08:55 -05:00
parent b0a9a7cf5e
commit dde9b6698b
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/webpack.config.js
View file

@ -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',