Rust: Fix more after merge.

geoffw0 · geoffw0 · commit 07011f74601f · 2025-03-17T12:22:09.000Z
diff --git a/rust/ql/src/queries/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
@@ -69,7 +69,6 @@ int getTaintEdgesCount() {
 }
 
 /**
-<<<<<<< HEAD
  * Gets a kind of query for which `n` is a sink (if any).
  */
 string getAQuerySinkKind(DataFlow::Node n) {
@@ -81,8 +80,6 @@ string getAQuerySinkKind(DataFlow::Node n) {
 }
 
 /**
-=======
->>>>>>> main
  * Gets a count of the total number of query sinks in the database.
  */
 int getQuerySinksCount() { result = count(QuerySink s) }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ int getTaintEdgesCount() {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`
`72`		`-<<<<<<< HEAD`
`73`	`72`	* Gets a kind of query for which `n` is a sink (if any).
`74`	`73`	`*/`
`75`	`74`	`string getAQuerySinkKind(DataFlow::Node n) {`
`@@ -81,8 +80,6 @@ string getAQuerySinkKind(DataFlow::Node n) {`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`/**`
`84`		`-=======`
`85`		`->>>>>>> main`
`86`	`83`	`* Gets a count of the total number of query sinks in the database.`
`87`	`84`	`*/`
`88`	`85`	`int getQuerySinksCount() { result = count(QuerySink s) }`