Resolving Conflicts

NicholasYancey · NicholasYancey · commit f21a1b29121e · 2025-07-17T14:04:02.000-04:00
diff --git a/cmd/non-admin/backup/logs.go b/cmd/non-admin/backup/logs.go
@@ -149,6 +149,6 @@ func NewLogsCommand(f client.Factory, use string) *cobra.Command {
 
 			return nil
 		},
-		Example: `  kubectl oadp non-admin backup logs my-backup`,
+		Example: `  kubectl oadp nonadmin backup logs my-backup`,
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,6 @@ func NewLogsCommand(f client.Factory, use string) *cobra.Command {`
`149`	`149`
`150`	`150`	`return nil`
`151`	`151`	`},`
`152`		- Example: ` kubectl oadp non-admin backup logs my-backup`,
	`152`	+ Example: ` kubectl oadp nonadmin backup logs my-backup`,
`153`	`153`	`}`
`154`	`154`	`}`