From eb089a04e014e883eb7a79b320d8ba8b5d6d310f Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Sat, 6 Feb 2021 20:04:49 +0530 Subject: [PATCH] fix: conflic --- OPTIONS.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OPTIONS.md b/OPTIONS.md index 1df9e79f230..ad5e4473f34 100644 --- a/OPTIONS.md +++ b/OPTIONS.md @@ -9,11 +9,7 @@ Options: --config-name Name of the configuration to use. -m, --merge Merge two or more configurations using 'webpack-merge'. --env Environment passed to the configuration when it is a function. -<<<<<<< HEAD - --node-env Sets process.env.NODE_ENV to the specified value -======= --node-env Sets process.env.NODE_ENV to the specified value. ->>>>>>> feat: show '--node-env' in minimum help output -h, --hot Enables Hot Module Replacement --no-hot Disables Hot Module Replacement. --analyze It invokes webpack-bundle-analyzer plugin to get bundle information.