Missed in the rebase conflicts

This commit is contained in:
Daniel Huckstep
2013-06-06 10:20:34 -06:00
parent 076ae903c0
commit f8288546f8

View File

@@ -97,7 +97,7 @@ module Liquid
drop = args.shift
drop.context = Context.new([drop, assigns], instance_assigns, registers, @rethrow_errors, @resource_limits)
when Hash
Context.new([args.shift, assigns], instance_assigns, registers, @rethrow_errors)
Context.new([args.shift, assigns], instance_assigns, registers, @rethrow_errors, @resource_limits)
when nil
Context.new(assigns, instance_assigns, registers, @rethrow_errors, @resource_limits)
else