fix mergeconflict

This commit is contained in:
Tobias Lütke
2012-08-07 13:21:31 -04:00
parent 6e091909ee
commit 16c34595a4

View File

@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = "liquid"
s.version = "2.4.0"
s.version = "2.4.1"
s.platform = Gem::Platform::RUBY
s.summary = "A secure, non-evaling end user template engine with aesthetic markup."
s.authors = ["Tobias Luetke"]