fix: conflicts

webpack · Jun 17, 2020 · f8d3248 · f8d3248
1 parent 816099c
commit f8d3248
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/packages/webpack-cli/lib/utils/arg-parser.js b/packages/webpack-cli/lib/utils/arg-parser.js
@@ -38,7 +38,6 @@ function argParser(options, args, argsOnly = false, name = '', helpFunction = un
     // Register options on the parser
     options.reduce((parserInstance, option) => {
         const flags = option.alias ? `-${option.alias}, --${option.name}` : `--${option.name}`;
-<<<<<<< HEAD
         const flagsWithType = option.type !== Boolean ? flags + ' <value>' : flags;
         if (option.type === Boolean || option.type === String) {
             if (!option.multiple) {
@@ -47,11 +46,6 @@ function argParser(options, args, argsOnly = false, name = '', helpFunction = un
                 const multiArg = (value, previous = []) => previous.concat([value]);
                 parserInstance.option(flagsWithType, option.description, multiArg, option.defaultValue);
             }
-=======
-        const flagsWithType = option.type !== Boolean && option.simpleType !== 'boolean' ? flags + ' <value>' : flags;
-        if (option.type === Boolean || option.type === String || option.simpleType === 'boolean') {
-            parserInstance.option(flagsWithType, option.description, option.defaultValue);
->>>>>>> feat(webpack-cli): import flags from webpack core
         } else {
             // in this case the type is a parsing function
             parserInstance.option(flagsWithType, option.description, option.type, option.defaultValue);