diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/webpack.config.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 3abdb6c2d76..a539dc511fa 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -34,8 +34,11 @@ 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', @@ -49,6 +52,7 @@ var config = { profile: './profile/profile_bundle.js', protected_branches: './protected_branches/protected_branches_bundle.js', protected_tags: './protected_tags', + sidebar: './sidebar/sidebar_bundle.js', snippet: './snippet/snippet_bundle.js', sketch_viewer: './blob/sketch_viewer.js', stl_viewer: './blob/stl_viewer.js', @@ -133,7 +137,7 @@ var config = { 'diff_notes', 'environments', 'environments_folder', - 'issuable', + 'sidebar', 'issue_show', 'merge_conflicts', 'notebook_viewer', |