diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-04 10:08:55 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-04 10:08:55 -0500 |
| commit | dde9b6698bb67dc34650a588ad3e644843067800 (patch) | |
| tree | 1b293ef9969ebd99a554003c8d44b0865ca68486 /config/webpack.config.js | |
| parent | b0a9a7cf5ee670ae07c4a9751d9c6e8bed1063b7 (diff) | |
| download | gitlab-ce-dde9b6698bb67dc34650a588ad3e644843067800.tar.gz | |
Fix webpack config conflict
Diffstat (limited to 'config/webpack.config.js')
| -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 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', |