Ruby: fix clashing method names from merge conflict

Author: nickrolfe

ruby/ql/test/library-tests/frameworks/action_controller/params_flow.rb

@@ -162,13 +162,13 @@ def m33
 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