chore: resolve conflicts

peternhale · peternhale · commit f72eae5de7ef · 2023-01-19T06:12:44.000-07:00
diff --git a/command-snapshot.json b/command-snapshot.json
@@ -56,7 +56,7 @@
   {
     "command": "org:display:user",
     "plugin": "@salesforce/plugin-user",
-    "flags": ["api-version", "json", "loglevel", "target-dev-hub", "target-org", "verbose"],
+    "flags": ["api-version", "json", "loglevel", "target-dev-hub", "target-org"],
     "alias": ["force:user:display"]
   },
   {
diff --git a/messages/display.md b/messages/display.md
@@ -19,14 +19,12 @@ Output includes the profile name, org ID, access token, instance URL, login URL,
 # securityWarning
 
 This command exposes sensitive information that allows for subsequent activity using your current authenticated session.
-Sharing this information is equivalent to logging someone in under the current credential, resulting in unintended access and escalation of privilege.
+Sharing this information is equivalent to logging someone in under the current credential, resulting in unintended
+access and escalation of privilege.
 For additional information, review the authorization section of
 the https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_auth_web_flow.htm
 
 # flags.target-hub.deprecation
 
-The --target-dev-hub flag is deprecated and is no longer used by this command. The flag will be removed in API version 57.0 or later.
-
-# flags.verbose.summary
-
-Display additional information
+The --target-dev-hub flag is deprecated and is no longer used by this command. The flag will be removed in API version
+57.0 or later.
diff --git a/src/commands/org/display/user.ts b/src/commands/org/display/user.ts
@@ -8,7 +8,6 @@
 import { AuthFields, Connection, Logger, Messages, StateAggregator } from '@salesforce/core';
 import { ensureString, getString } from '@salesforce/ts-types';
 import {
-  Flags,
   loglevel,
   optionalHubFlagWithDeprecations,
   orgApiVersionFlagWithDeprecations,
@@ -48,7 +47,6 @@ export class DisplayUserCommand extends SfCommand<DisplayUserResult> {
     'target-org': requiredOrgFlagWithDeprecations,
     'api-version': orgApiVersionFlagWithDeprecations,
     loglevel,
-    verbose: Flags.boolean({ summary: messages.getMessage('flags.verbose.summary') }),
   };
 
   private logger: Logger;

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`{`
`57`	`57`	`"command": "org:display:user",`
`58`	`58`	`"plugin": "@salesforce/plugin-user",`
`59`		`- "flags": ["api-version", "json", "loglevel", "target-dev-hub", "target-org", "verbose"],`
	`59`	`+ "flags": ["api-version", "json", "loglevel", "target-dev-hub", "target-org"],`
`60`	`60`	`"alias": ["force:user:display"]`
`61`	`61`	`},`
`62`	`62`	`{`