fixed conflict in webpack.config.js

3a13063f · Phil Hughes · 9ac4e26a · 3a13063f
Commit 3a13063f authored Feb 15, 2018 by Phil Hughes
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
@@ -104,10 +104,7 @@ var config = {
    roadmap:              'ee/roadmap',
    ide:                 './ide/index.js',
    sidebar:              './sidebar/sidebar_bundle.js',
-<<<<<<< HEAD
    ee_sidebar:           'ee/sidebar/sidebar_bundle.js',
-=======
->>>>>>> upstream/master
    snippet:              './snippet/snippet_bundle.js',
    sketch_viewer:        './blob/sketch_viewer.js',
    stl_viewer:           './blob/stl_viewer.js',