From 94d5dd3b7bf5fb922458cec7659754164e8182c6 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Tue, 27 Feb 2018 16:51:12 -0600
Subject: remove merge_conflicts bundle in favor of pages directory entry point

---
 config/webpack.config.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'config')

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',
-- 
cgit v1.2.1