mirror of
https://github.com/Shopify/liquid.git
synced 2026-09-16 17:30:43 -07:00
merge conflicts
This commit is contained in:
@@ -25,7 +25,7 @@ module Liquid
|
||||
end
|
||||
|
||||
def markup_context(markup)
|
||||
"in \"#{markup.strip}\""
|
||||
"in \"#{markup.strip}\""
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user