diff options
| author | Andrew Kim <andrewdkim@users.noreply.github.com> | 2019-03-16 18:25:06 -0400 |
|---|---|---|
| committer | Andrew Kim <andrewdkim@users.noreply.github.com> | 2019-03-16 18:25:06 -0400 |
| commit | 07f7eb81e2eb9b28369c83d02a63e77d5ece14bf (patch) | |
| tree | 3d1c50b5f1a7b4ba496fbf189b9d2d3f3fd89de3 /webpack.config.js | |
| parent | f8a2744ea03ec03236284939d14787b04b9c8aa6 (diff) | |
| parent | 98dff6ca1915ef006e13532f593219c9bc4ccc97 (diff) | |
merge conflicts resolved
Diffstat (limited to 'webpack.config.js')
| -rw-r--r-- | webpack.config.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webpack.config.js b/webpack.config.js index 52ad2c653..ff03181c9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,8 +8,8 @@ module.exports = { bundle: ["./src/client/views/Main.tsx", 'webpack-hot-middleware/client?reload=true'], viewer: ["./src/debug/Viewer.tsx", 'webpack-hot-middleware/client?reload=true'], test: ["./src/debug/Test.tsx", 'webpack-hot-middleware/client?reload=true'], - image_upload: ["./src/debug/mobile/ImageUpload.tsx", 'webpack-hot-middleware/client?reload=true'], - ink_control: ["./src/debug/mobile/InkControl.tsx", 'webpack-hot-middleware/client?reload=true'], + inkControls: ["./src/mobile/InkControls.tsx", 'webpack-hot-middleware/client?reload=true'], + imageUpload: ["./src/mobile/ImageUpload.tsx", 'webpack-hot-middleware/client?reload=true'], }, devtool: "source-map", node: { |