From d18141d4d2a06435ef30f1e64dfaf810686940df Mon Sep 17 00:00:00 2001
From: Kornelius Kalnbach <murphy@rubychan.de>
Date: Tue, 27 Dec 2011 04:11:24 +0100
Subject: yikes

---
 coderay.gemspec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/coderay.gemspec b/coderay.gemspec
index f30f5fe..ad7a2bb 100644
--- a/coderay.gemspec
+++ b/coderay.gemspec
@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
     # revision = 134 + (`git log --oneline | wc -l`.to_i)
     # s.version = "#{CodeRay::VERSION}.#{revision}rc1"
     s.version = "#{CodeRay::VERSION}.rc1"
->>>>>>> master
   end
   
   s.authors     = ['Kornelius Kalnbach']
-- 
cgit v1.2.1