Resolved webpack conflict

2681a608 · Phil Hughes · 2bcb19dd · 2681a608
Commit 2681a608 authored May 10, 2017 by Phil Hughes
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

config/webpack.config.js config/webpack.config.js +1 -4

No files found.
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -149,13 +149,10 @@ var config = {
        'notebook_viewer',
        'pdf_viewer',
        'pipelines',
-<<<<<<< HEAD
        'mr_widget_ee',
-        'issue_show'
-=======
+        'issue_show',
        'balsamiq_viewer',
        'pipelines_graph',
->>>>>>> upstream/master
      ],
      minChunks: function(module, count) {
        return module.resource && (/vue_shared/).test(module.resource);