diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-05 09:19:58 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-05 09:19:58 -0500 |
| commit | 40f51c8e8172933ec511dd828a589abb52d83c45 (patch) | |
| tree | 80d5b64671bfd53a455141a3bdec6e2bc489a756 /config | |
| parent | 5004579b15b0585c0a26231d7422fb1d8086bd66 (diff) | |
| download | gitlab-ce-40f51c8e8172933ec511dd828a589abb52d83c45.tar.gz | |
[skip ci] Fix FE conflicts with master
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', |