Merge conflict fix

This commit is contained in:
Frikky
2025-08-22 00:02:57 +02:00
+1 -1
View File
@@ -2301,7 +2301,7 @@ func main() {
} }
if os.Getenv("SHUFFLE_SWARM_CONFIG") == "run" && os.Getenv("SHUFFLE_SCALE_REPLICAS") == "" { if os.Getenv("SHUFFLE_SWARM_CONFIG") == "run" && os.Getenv("SHUFFLE_SCALE_REPLICAS") == "" {
// go AutoScale(ctx) //go AutoScale(ctx)
} }
hasStarted = true hasStarted = true
} }