Resolve config/webpack.config.js

066eed4f · Lin Jen-Shin · ff551956 · 066eed4f
Commit 066eed4f authored Oct 13, 2017 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

config/webpack.config.js config/webpack.config.js +1 -4

No files found.
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -229,11 +229,8 @@ var config = {
        'graphs',
        'graphs_show',
        'monitoring',
-<<<<<<< HEAD
-        'burndown_chart',
-=======
        'users',
->>>>>>> upstream/master
+        'burndown_chart', // EE
      ],
    }),