Commit ae1b6ea6 authored by Stan Hu's avatar Stan Hu

Resolve conflict in config/webpack.config.js

parent 43beefcf
......@@ -56,11 +56,8 @@ var config = {
entry: {
balsamiq_viewer: './blob/balsamiq_viewer.js',
blob: './blob_edit/blob_bundle.js',
<<<<<<< HEAD
=======
common: './commons/index.js',
common_vue: './vue_shared/vue_resource_interceptor.js',
>>>>>>> upstream/master
cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js',
commit_pipelines: './commit/pipelines/pipelines_bundle.js',
diff_notes: './diff_notes/diff_notes_bundle.js',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment