yikes

korny · korny · commit d18141d4d2a0 · 2011-12-27T04:11:24.000+01:00
diff --git 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']
