Merge branch 'master' into issue/2700

bassosimone · bassosimone · commit 4ddd5070c316 · 2024-04-30T14:56:31.000+02:00
Conflicts:
	internal/probeservices/collector_test.go
diff --git a/internal/probeservices/collector_test.go b/internal/probeservices/collector_test.go
@@ -72,7 +72,7 @@ func TestNewReportTemplate(t *testing.T) {
 	// define expectations
 	expect := newReportTemplateForTesting()
 
-	// make sure they ar4e equal
+	// make sure they are equal
 	if diff := cmp.Diff(expect, rt); diff != "" {
 		t.Fatal(diff)
 	}

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func TestNewReportTemplate(t *testing.T) {`
`72`	`72`	`// define expectations`
`73`	`73`	`expect := newReportTemplateForTesting()`
`74`	`74`
`75`		`- // make sure they ar4e equal`
	`75`	`+ // make sure they are equal`
`76`	`76`	`if diff := cmp.Diff(expect, rt); diff != "" {`
`77`	`77`	`t.Fatal(diff)`
`78`	`78`	`}`