Resolve conflict

Alvaro Muñoz · Alvaro Muñoz · commit ad45d319c51d · 2024-05-08T22:37:22.000+02:00
diff --git a/ql/src/Security/CWE-349/CachePoisoning.ql b/ql/src/Security/CWE-349/CachePoisoning.ql
@@ -47,5 +47,5 @@ where
     checkout.getAFollowingStep() = s and
     s instanceof PoisonableStep
   )
-select checkout, "Untrusted checked-out code may lead to cache poisoning on step $@.", s,
+select checkout, "Potential cache poisoning in the context of the default branch on step $@.", s,
   s.toString()

Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,5 @@ where`
`47`	`47`	`checkout.getAFollowingStep() = s and`
`48`	`48`	`s instanceof PoisonableStep`
`49`	`49`	`)`
`50`		`-select checkout, "Untrusted checked-out code may lead to cache poisoning on step $@.", s,`
	`50`	`+select checkout, "Potential cache poisoning in the context of the default branch on step $@.", s,`
`51`	`51`	`s.toString()`