merge@

vburckhardt · vburckhardt · commit 403da4848a01 · 2025-09-22T13:19:11.000+01:00
diff --git a/solutions/fleets/outputs.tf b/solutions/fleets/outputs.tf
@@ -71,8 +71,6 @@ output "next_step_primary_url" {
   value       = "https://github.com/IBM/CodeEngine/blob/main/beta/serverless-fleets/README.md#launch-a-fleet"
   description = "primary url"
 }
-<<<<<<< HEAD
-=======
 
 output "next_step_secondary_label" {
   value       = "Go to Code Engine Project"
@@ -84,4 +82,3 @@ output "next_step_secondary_url" {
   description = "primary url"
 }
 
->>>>>>> a0c0e845fdd217fcb34fac7026010b52c1a4475e

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,6 @@ output "next_step_primary_url" {`
`71`	`71`	`value = "https://github.com/IBM/CodeEngine/blob/main/beta/serverless-fleets/README.md#launch-a-fleet"`
`72`	`72`	`description = "primary url"`
`73`	`73`	`}`
`74`		`-<<<<<<< HEAD`
`75`		`-=======`
`76`	`74`
`77`	`75`	`output "next_step_secondary_label" {`
`78`	`76`	`value = "Go to Code Engine Project"`
`@@ -84,4 +82,3 @@ output "next_step_secondary_url" {`
`84`	`82`	`description = "primary url"`
`85`	`83`	`}`
`86`	`84`
`87`		`->>>>>>> a0c0e845fdd217fcb34fac7026010b52c1a4475e`