C#: Fix merge issues after re-base.

michaelnebel · michaelnebel · commit fbc36800aa7c · 2022-08-24T09:58:54.000+02:00
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/ExternalFlow.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/ExternalFlow.qll
@@ -365,7 +365,7 @@ module CsvValidation {
     or
     exists(string row, string kind | sourceModel(row) |
       kind = row.splitAt(";", 7) and
-      not kind = "local" and
+      not kind = ["local", "file"] and
       result = "Invalid kind \"" + kind + "\" in source model."
     )
   }

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ module CsvValidation {`
`365`	`365`	`or`
`366`	`366`	`exists(string row, string kind \| sourceModel(row) \|`
`367`	`367`	`kind = row.splitAt(";", 7) and`
`368`		`- not kind = "local" and`
	`368`	`+ not kind = ["local", "file"] and`
`369`	`369`	`result = "Invalid kind \"" + kind + "\" in source model."`
`370`	`370`	`)`
`371`	`371`	`}`