merge conflicts

This commit is contained in:
Florian Weingarten
2014-09-05 14:16:20 +00:00
parent 939365c234
commit ce06ed4bb1
2 changed files with 1 additions and 2 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ module Liquid
end
def markup_context(markup)
"in \"#{markup.strip}\""
"in \"#{markup.strip}\""
end
end
end