From 3335d48154fa8871eadf5ade02f1e7666468ad62 Mon Sep 17 00:00:00 2001 From: Asger F Date: Tue, 16 Apr 2024 20:26:41 +0200 Subject: [PATCH] Sync files --- .../python/frameworks/data/internal/ApiGraphModels.qll | 10 ---------- .../ruby/frameworks/data/internal/ApiGraphModels.qll | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModels.qll b/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModels.qll index bdcea5a797a..b850a4acea0 100644 --- a/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModels.qll +++ b/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModels.qll @@ -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) } diff --git a/ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModels.qll b/ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModels.qll index bdcea5a797a..b850a4acea0 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModels.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModels.qll @@ -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) }