Fix webpack config conflict

2017-05-04 10:08:55 -05:00 · 2017-05-04 10:08:55 -05:00 · dde9b6698b
parent b0a9a7cf5e
commit dde9b6698b
1 changed files with 0 additions and 5 deletions
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@ -33,11 +33,6 @@ var config = {
    graphs:               './graphs/graphs_bundle.js',
    group:                './group.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',
    main:                 './main.js',
    merge_conflicts:      './merge_conflicts/merge_conflicts_bundle.js',