summaryrefslogtreecommitdiff
path: root/coderay.gemspec
diff options
context:
space:
mode:
Diffstat (limited to 'coderay.gemspec')
-rw-r--r--coderay.gemspec1
1 files changed, 0 insertions, 1 deletions
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']