Commitc678d8e

committed

fix merge conflict

1 parent70e9e28 commitc678d8eCopy full SHA for c678d8e

File tree

-0

lines changed

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -592,6 +592,10 @@ pub fn resource(subcommand: &ResourceSubCommand, progress_format: ProgressFormat`
`592`	`592`	`resource_command::get_all(&dsc, resource, output_format.as_ref());`
`593`	`593`	`}`
`594`	`594`	`else{`
	`595`	`+if*output_format ==Some(GetOutputFormat::JsonArray){`
	`596`	`+error!("{}", t!("subcommand.jsonArrayNotSupported"));`
	`597`	`+exit(EXIT_INVALID_ARGS);`
	`598`	`+}`
`595`	`599`	`let parsed_input =get_input(input.as_ref(), path.as_ref(),false);`
`596`	`600`	`resource_command::get(&dsc, resource,&parsed_input, output_format.as_ref());`
`597`	`601`	`}`

Comments

(0)