Removing extra line introduced while resolving conflicts

ycombinator · ycombinator · commit 596f79c6248e · 2025-06-27T16:51:59.000-07:00
diff --git a/internal/pkg/agent/cmd/watch.go b/internal/pkg/agent/cmd/watch.go
@@ -118,7 +118,6 @@ func watchCmd(cmd *cobra.Command, log *logp.Logger, topDir string, cfg *configur
 			stateString = string(marker.Details.State)
 		}
 		log.Infof("not within grace [updatedOn %v] %v or agent have been rolled back [state: %s]", marker.UpdatedOn.String(), time.Since(marker.UpdatedOn).String(), stateString)
-
 		// if it is started outside of upgrade loop
 		// if we're not within grace and marker is still there it might mean
 		// that cleanup was not performed ok, cleanup everything except current version

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,6 @@ func watchCmd(cmd cobra.Command, log logp.Logger, topDir string, cfg *configur`
`118`	`118`	`stateString = string(marker.Details.State)`
`119`	`119`	`}`
`120`	`120`	`log.Infof("not within grace [updatedOn %v] %v or agent have been rolled back [state: %s]", marker.UpdatedOn.String(), time.Since(marker.UpdatedOn).String(), stateString)`
`121`		`-`
`122`	`121`	`// if it is started outside of upgrade loop`
`123`	`122`	`// if we're not within grace and marker is still there it might mean`
`124`	`123`	`// that cleanup was not performed ok, cleanup everything except current version`