Java: remove PR-merging comment

Jami Cogswell · Jami Cogswell · commit f01ee9e4c279 · 2022-12-15T22:56:15.000-05:00
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
@@ -249,7 +249,7 @@ module Public {
      * Holds if the summary has the given provenance where `true` is
      * `generated` and `false` is `manual`.
      */
-    predicate hasProvenance(boolean generated) { none() } // ! merge with PR #11585
+    predicate hasProvenance(boolean generated) { none() }
   }
 
   /** A callable where there is no flow via the callable. */
@@ -1027,7 +1027,7 @@ module Private {
 
       override predicate hasProvenance(boolean generated) {
         summaryElement(this, _, _, _, generated)
-      } // ! merge with PR #11585
+      }
     }
 
     /** Holds if component `c` of specification `spec` cannot be parsed. */
diff --git a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
@@ -249,7 +249,7 @@ module Public {
      * Holds if the summary has the given provenance where `true` is
      * `generated` and `false` is `manual`.
      */
-    predicate hasProvenance(boolean generated) { none() } // ! merge with PR #11585
+    predicate hasProvenance(boolean generated) { none() }
   }
 
   /** A callable where there is no flow via the callable. */
@@ -1027,7 +1027,7 @@ module Private {
 
       override predicate hasProvenance(boolean generated) {
         summaryElement(this, _, _, _, generated)
-      } // ! merge with PR #11585
+      }
     }
 
     /** Holds if component `c` of specification `spec` cannot be parsed. */
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
@@ -249,7 +249,7 @@ module Public {
      * Holds if the summary has the given provenance where `true` is
      * `generated` and `false` is `manual`.
      */
-    predicate hasProvenance(boolean generated) { none() } // ! merge with PR #11585
+    predicate hasProvenance(boolean generated) { none() }
   }
 
   /** A callable where there is no flow via the callable. */
@@ -1027,7 +1027,7 @@ module Private {
 
       override predicate hasProvenance(boolean generated) {
         summaryElement(this, _, _, _, generated)
-      } // ! merge with PR #11585
+      }
     }
 
     /** Holds if component `c` of specification `spec` cannot be parsed. */
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll
@@ -249,7 +249,7 @@ module Public {
      * Holds if the summary has the given provenance where `true` is
      * `generated` and `false` is `manual`.
      */
-    predicate hasProvenance(boolean generated) { none() } // ! merge with PR #11585
+    predicate hasProvenance(boolean generated) { none() }
   }
 
   /** A callable where there is no flow via the callable. */
@@ -1027,7 +1027,7 @@ module Private {
 
       override predicate hasProvenance(boolean generated) {
         summaryElement(this, _, _, _, generated)
-      } // ! merge with PR #11585
+      }
     }
 
     /** Holds if component `c` of specification `spec` cannot be parsed. */
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll
@@ -249,7 +249,7 @@ module Public {
      * Holds if the summary has the given provenance where `true` is
      * `generated` and `false` is `manual`.
      */
-    predicate hasProvenance(boolean generated) { none() } // ! merge with PR #11585
+    predicate hasProvenance(boolean generated) { none() }
   }
 
   /** A callable where there is no flow via the callable. */
@@ -1027,7 +1027,7 @@ module Private {
 
       override predicate hasProvenance(boolean generated) {
         summaryElement(this, _, _, _, generated)
-      } // ! merge with PR #11585
+      }
     }
 
     /** Holds if component `c` of specification `spec` cannot be parsed. */
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll b/swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImpl.qll
@@ -249,7 +249,7 @@ module Public {
      * Holds if the summary has the given provenance where `true` is
      * `generated` and `false` is `manual`.
      */
-    predicate hasProvenance(boolean generated) { none() } // ! merge with PR #11585
+    predicate hasProvenance(boolean generated) { none() }
   }
 
   /** A callable where there is no flow via the callable. */
@@ -1027,7 +1027,7 @@ module Private {
 
       override predicate hasProvenance(boolean generated) {
         summaryElement(this, _, _, _, generated)
-      } // ! merge with PR #11585
+      }
     }
 
     /** Holds if component `c` of specification `spec` cannot be parsed. */

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ module Public {`
`249`	`249`	* Holds if the summary has the given provenance where `true` is
`250`	`250`	* `generated` and `false` is `manual`.
`251`	`251`	`*/`
`252`		`- predicate hasProvenance(boolean generated) { none() } // ! merge with PR #11585`
	`252`	`+ predicate hasProvenance(boolean generated) { none() }`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`/** A callable where there is no flow via the callable. */`
`@@ -1027,7 +1027,7 @@ module Private {`
`1027`	`1027`
`1028`	`1028`	`override predicate hasProvenance(boolean generated) {`
`1029`	`1029`	`summaryElement(this, _, _, _, generated)`
`1030`		`- } // ! merge with PR #11585`
	`1030`	`+ }`
`1031`	`1031`	`}`
`1032`	`1032`
`1033`	`1033`	/** Holds if component `c` of specification `spec` cannot be parsed. */