Resolve semantic conflicts after rebase

This commit is contained in:
Tom Hvitved
2021-09-21 11:07:58 +02:00
parent 564c76c41f
commit cdc359527a
3 changed files with 4 additions and 7 deletions

View File

@@ -25,6 +25,7 @@ nodes
| summaries.rb:16:12:16:43 | call to apply_lambda : | semmle.label | call to apply_lambda : |
| summaries.rb:16:36:16:42 | tainted : | semmle.label | tainted : |
| summaries.rb:18:6:18:13 | tainted3 | semmle.label | tainted3 |
subpaths
invalidSpecComponent
#select
| summaries.rb:2:6:2:12 | tainted | summaries.rb:1:20:1:26 | "taint" : | summaries.rb:2:6:2:12 | tainted | $@ | summaries.rb:1:20:1:26 | "taint" : | "taint" : |