Skip to content

Commit f516ea4

Browse files
committed
Fix bad merge
1 parent a1e3f51 commit f516ea4

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

lib/graphql/schema/input_object.rb

-13
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,6 @@ def to_hash
4444
to_h
4545
end
4646

47-
<<<<<<< HEAD
48-
=======
49-
def deconstruct_keys(keys = nil)
50-
if keys.nil?
51-
@ruby_style_hash
52-
else
53-
new_h = {}
54-
keys.each { |k| @ruby_style_hash.key?(k) && new_h[k] = @ruby_style_hash[k] }
55-
new_h
56-
end
57-
end
58-
59-
>>>>>>> d85e69690f (Disable development NoEvalCop for load-time eval calls)
6047
def prepare
6148
if @context
6249
object = @context[:current_object]

0 commit comments

Comments
 (0)