From ffc25f8f894b208923e9fc4072d87a09a4ff1f76 Mon Sep 17 00:00:00 2001
From: Anders Schack-Mulligen <aschackmull@github.com>
Date: Thu, 14 Oct 2021 11:13:04 +0200
Subject: [PATCH] Fix semantic merge conflict.

---
 ql/src/codeql_ql/ast/internal/Predicate.qll | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ql/src/codeql_ql/ast/internal/Predicate.qll b/ql/src/codeql_ql/ast/internal/Predicate.qll
index d6981aeb624..31c91c7ae6d 100644
--- a/ql/src/codeql_ql/ast/internal/Predicate.qll
+++ b/ql/src/codeql_ql/ast/internal/Predicate.qll
@@ -91,8 +91,8 @@ private module Cached {
     rel.getName() = pc.getPredicateName()
   }
 
-  private predicate resolveDBRelation(PredicateCall pc, DefinedPredicate p) {
-    exists(Relation rel | p = TPred(rel) |
+  private predicate resolveDBRelation(PredicateCall pc, Predicate p) {
+    exists(Relation rel | p = rel |
       candidate(rel, pc) and
       rel.getArity() = pc.getNumberOfArguments() and
       (