diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-02-27 16:51:12 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-02-27 16:51:12 -0600 |
| commit | 94d5dd3b7bf5fb922458cec7659754164e8182c6 (patch) | |
| tree | 4d00ce69d971e40a3a8288821bc7d7026da33fd5 /config | |
| parent | 0be4a77d0012613f960c4177f53101c46de2899c (diff) | |
| download | gitlab-ce-94d5dd3b7bf5fb922458cec7659754164e8182c6.tar.gz | |
remove merge_conflicts bundle in favor of pages directory entry point
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 613ed1cad03..20d398c41ea 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -50,7 +50,6 @@ function generateEntries() { environments: './environments/environments_bundle.js', filtered_search: './filtered_search/filtered_search_bundle.js', help: './help/help.js', - merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', monitoring: './monitoring/monitoring_bundle.js', notebook_viewer: './blob/notebook_viewer.js', pdf_viewer: './blob/pdf_viewer.js', @@ -241,7 +240,6 @@ var config = { 'environments', 'filtered_search', 'groups', - 'merge_conflicts', 'monitoring', 'notebook_viewer', 'pdf_viewer', |