Resolve conflicts in config/webpack.config.js

[ci-skip]

Resolve conflicts in config/webpack.config.js
[ci-skip]
002b02fe · Mike Greiling · f72f95c9 · 002b02fe
Commit 002b02fe authored May 08, 2018 by Mike Greiling
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

config/webpack.config.js config/webpack.config.js +0 -3

No files found.
--- a/config/webpack.config.js
+++ b/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', {
    cwd: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
@@ -45,8 +44,6 @@ function generateEntries() {
  eePageEntries.forEach(path => generateAutoEntries(path, 'ee'));
  watchAutoEntries.push(path.join(ROOT_PATH, 'ee/app/assets/javascripts/pages/'));

-=======
->>>>>>> upstream/master
  const autoEntryKeys = Object.keys(autoEntriesMap);
  autoEntriesCount = autoEntryKeys.length;