Merge pull request #5273 from rmosolgo/2.1-fix-bad-merge

[2.1] fix bad merge

Author: rmosolgo

lib/graphql/schema/input_object.rb

@@ -44,19 +44,6 @@ def to_hash
         to_h
       end
 
-<<<<<<< HEAD
-=======
-      def deconstruct_keys(keys = nil)
-        if keys.nil?
-          @ruby_style_hash
-        else
-          new_h = {}
-          keys.each { |k| @ruby_style_hash.key?(k) && new_h[k] = @ruby_style_hash[k] }
-          new_h
-        end
-      end
-
->>>>>>> d85e69690f (Disable development NoEvalCop for load-time eval calls)
       def prepare
         if @context
           object = @context[:current_object]