From 16c34595a45d032dd0d54e5acb49fac442f578db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Lu=CC=88tke?= <tobi@shopify.com>
Date: Tue, 7 Aug 2012 13:21:31 -0400
Subject: [PATCH] fix mergeconflict

---
 liquid.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/liquid.gemspec b/liquid.gemspec
index 22e6940..91d4b94 100644
--- a/liquid.gemspec
+++ b/liquid.gemspec
@@ -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"]