hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-03-14 11:36:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync files

Browse Source
This commit is contained in:
Asger F
2024-04-16 20:26:41 +02:00
parent c0db40d11a
commit 3335d48154
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModels.qll
View File

@@ -341,18 +341,8 @@ private predicate summaryModel(
}
/** Holds if a type model exists for the given parameters. */
<<<<<<< HEAD
predicate typeModel(string type1, string type2, string path) {
exists(string row |
typeModel(row) and
row.splitAt(";", 0) = type1 and
row.splitAt(";", 1) = type2 and
row.splitAt(";", 2) = path
)
=======
private predicate typeModel(string type1, string type2, string path) {
any(DeprecationAdapter a).typeModel(type1, type2, path)
>>>>>>> main
or
Extensions::typeModel(type1, type2, path)
}