summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2011-12-27 04:11:24 +0100
committerKornelius Kalnbach <murphy@rubychan.de>2011-12-27 04:11:24 +0100
commitd18141d4d2a06435ef30f1e64dfaf810686940df (patch)
tree13cad51878072ea8ffaa82e67f3ef1bdc2011d1f
parent2afe23ab0a3d17b50f55750241a682403ced4fc8 (diff)
downloadcoderay-d18141d4d2a06435ef30f1e64dfaf810686940df.tar.gz
yikes
-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']