Resolve conflicts in config/webpack.config.js

config/webpack.config.js

@@ -37,7 +37,6 @@ function generateEntries() {
   }
 
   pageEntries.forEach(path => generateAutoEntries(path));
-<<<<<<< HEAD
 
   // EE-specific auto entries
   const eePageEntries = glob.sync('pages/**/index.js', {
@@ -45,8 +44,6 @@ function generateEntries() {
   });
   eePageEntries.forEach(path => generateAutoEntries(path, 'ee'));
   watchAutoEntries.concat(path.join(ROOT_PATH, 'ee/app/assets/javascripts/pages/'));
-=======
->>>>>>> upstream/master
 
   autoEntriesCount = Object.keys(autoEntries).length;
 
@@ -256,15 +253,12 @@ const config = {
       vendor: path.join(ROOT_PATH, 'vendor/assets/javascripts'),
       vue$: 'vue/dist/vue.esm.js',
       spec: path.join(ROOT_PATH, 'spec/javascripts'),
-<<<<<<< HEAD
 
       // EE-only
       ee: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
       ee_empty_states: path.join(ROOT_PATH, 'ee/app/views/shared/empty_states'),
       ee_icons: path.join(ROOT_PATH, 'ee/app/views/shared/icons'),
       ee_images: path.join(ROOT_PATH, 'ee/app/assets/images'),
-=======
->>>>>>> upstream/master
     },
   },