Fix conflict in config/webpack.config.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

config/webpack.config.js

@@ -149,18 +149,14 @@ var config = {
         'notebook_viewer',
         'pdf_viewer',
         'pipelines',
-<<<<<<< HEAD
         'mr_widget_ee',
         'issue_show',
         'balsamiq_viewer',
         'pipelines_graph',
-=======
-        'pipelines_graph',
         'schedule_form',
         'schedules_index',
         'sidebar',
         'vue_merge_request_widget',
->>>>>>> origin/master
       ],
       minChunks: function(module, count) {
         return module.resource && (/vue_shared/).test(module.resource);