diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/webpack.config.js | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index a539dc511fa..bc2aa1ebf0c 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -34,11 +34,6 @@ var config = { graphs: './graphs/graphs_bundle.js', group: './group.js', groups_list: './groups_list.js', -<<<<<<< HEAD -======= - issuable: './issuable/issuable_bundle.js', - locale: './locale/index.js', ->>>>>>> 10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77 issue_show: './issue_show/index.js', locale: './locale/index.js', main: './main.js', |