Resolved conflicts in config/webpack.config.js

0c9c3897 · Constance Okoghenun · aa562eaa · 0c9c3897
Commit 0c9c3897 authored Feb 22, 2018 by Constance Okoghenun
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
@@ -48,10 +48,7 @@ var config = {
  },
  context: path.join(ROOT_PATH, 'app/assets/javascripts'),
  entry: {
-<<<<<<< HEAD
    add_gitlab_slack_application: './add_gitlab_slack_application/index.js',
-=======
->>>>>>> upstream/master
    balsamiq_viewer:      './blob/balsamiq_viewer.js',
    blob:                 './blob_edit/blob_bundle.js',
    boards:               './boards/boards_bundle.js',