From dde9b6698bb67dc34650a588ad3e644843067800 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Thu, 4 May 2017 10:08:55 -0500 Subject: [PATCH] Fix webpack config conflict --- config/webpack.config.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/webpack.config.js b/config/webpack.config.js index 8cacafd611f..97597397b75 100644 --- 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',