mirror of
https://github.com/github/codeql.git
synced 2026-04-26 17:25:19 +02:00
Ruby: fix clashing method names from merge conflict
This commit is contained in:
@@ -162,13 +162,13 @@ class MyController < ActionController::Base
|
||||
end
|
||||
|
||||
module Mixin
|
||||
def m33
|
||||
def m34
|
||||
sink params[:x] # $hasTaintFlow
|
||||
end
|
||||
end
|
||||
|
||||
class Subclass < MyController
|
||||
def m34
|
||||
def m35
|
||||
sink params[:x] # $hasTaintFlow
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user