Resolve merge

ferranbt · ferranbt · commit 71d71086aa4d · 2025-04-02T09:27:50.000+01:00
diff --git a/internal/manifest.go b/internal/manifest.go
@@ -116,6 +116,7 @@ func RunWatchdog(manifest *Manifest) error {
 		}
 	}
 
+	// If any of the watchdogs fail, we return the error
 	if err := <-watchdogErr; err != nil {
 		return fmt.Errorf("failed to run watchdog: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ func RunWatchdog(manifest *Manifest) error {`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
	`119`	`+ // If any of the watchdogs fail, we return the error`
`119`	`120`	`if err := <-watchdogErr; err != nil {`
`120`	`121`	`return fmt.Errorf("failed to run watchdog: %w", err)`
`121`	`122`	`}`