Cleanup after rebase

stackrox · Nov 28, 2024 · 72fb150 · 72fb150
1 parent 570bf29
commit 72fb150
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/integration-tests/pkg/assert/assert.go b/integration-tests/pkg/assert/assert.go
@@ -1,7 +1,6 @@
 package assert
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -60,7 +59,6 @@ func AssertRepeated(t *testing.T, tickTime time.Duration, timeout time.Duration,
 	}
 }
 
->>>>>>> 66ca3aa0 (X-Smart-Squash: Squashed 41 commits:)
 func ElementsMatchFunc[N any](expected []N, actual []N, equal func(a, b N) bool) bool {
 	if len(expected) != len(actual) {
 		return false