chore(e2e): fix dotnet tests (#1368)

stackrox · Jan 12, 2024 · bb01189 · bb01189
1 parent a904189
commit bb01189
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/e2etests/testcase_test.go b/e2etests/testcase_test.go
@@ -3656,7 +3656,11 @@ For more details about the security issue(s), including the impact, a CVSS score
 				NamespaceName: "rhel:8",
 				VersionFormat: "rpm",
 				Version:       "6.0.6-1.el8_6.x86_64",
+<<<<<<< HEAD
 				FixedBy:       "6.0.23-1.el8_8",
+=======
+				FixedBy:       "6.0.26-1.el8_9",
+>>>>>>> 4732549f (chore(e2e): fix dotnet tests (#1368))
 				Vulnerabilities: []apiV1.Vulnerability{
 					{
 						Name:          "RHBA-2022:5747",
@@ -3695,7 +3699,11 @@ Bug Fix(es) and Enhancement(s):
 				NamespaceName: "rhel:8",
 				VersionFormat: "rpm",
 				Version:       "6.0.6-1.el8_6.x86_64",
+<<<<<<< HEAD
 				FixedBy:       "6.0.23-1.el8_8",
+=======
+				FixedBy:       "6.0.26-1.el8_9",
+>>>>>>> 4732549f (chore(e2e): fix dotnet tests (#1368))
 				Vulnerabilities: []apiV1.Vulnerability{
 					{
 						Name:          "RHBA-2022:5747",