fix tests

nicholasjackson · nicholasjackson · commit 2c5c944b6a90 · 2025-05-27T15:14:30.000+01:00
diff --git a/pkg/config/resources/exec/provider.go b/pkg/config/resources/exec/provider.go
@@ -364,7 +364,6 @@ func (p *Provider) generateOutput() error {
 		output[parts[0]] = cty.StringVal(parts[1])
 	}
 
-<<<<<<< HEAD
 	values := map[string]cty.Value{}
 	for k, v := range output {
 		value, err := convert.GoToCtyValue(v)
@@ -376,9 +375,6 @@ func (p *Provider) generateOutput() error {
 	}
 
 	p.config.Output = cty.ObjectVal(values)
-=======
-	p.config.Output = cty.MapVal(output)
->>>>>>> a364d15 (Use latest version of HCL Config)
 
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,6 @@ func (p *Provider) generateOutput() error {`
`364`	`364`	`output[parts[0]] = cty.StringVal(parts[1])`
`365`	`365`	`}`
`366`	`366`
`367`		`-<<<<<<< HEAD`
`368`	`367`	`values := map[string]cty.Value{}`
`369`	`368`	`for k, v := range output {`
`370`	`369`	`value, err := convert.GoToCtyValue(v)`
`@@ -376,9 +375,6 @@ func (p *Provider) generateOutput() error {`
`376`	`375`	`}`
`377`	`376`
`378`	`377`	`p.config.Output = cty.ObjectVal(values)`
`379`		`-=======`
`380`		`- p.config.Output = cty.MapVal(output)`
`381`		`->>>>>>> a364d15 (Use latest version of HCL Config)`
`382`	`378`
`383`	`379`	`return nil`
`384`	`380`	`}`