summaryrefslogtreecommitdiff
path: root/bundler.gemspec
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-02-01 13:18:06 -0800
committerCarl Lerche <carllerche@mac.com>2010-02-01 13:18:06 -0800
commit0df5a119235327046bb3fd2c36dbd5e9ff33ce1f (patch)
treeabeef57260deda43fe0af60ac776ba849366258f /bundler.gemspec
parente81a3d2b6a01d997a0a0581ad1b39c007d3b85c1 (diff)
downloadbundler-0df5a119235327046bb3fd2c36dbd5e9ff33ce1f.tar.gz
Add a spec for a runtime path bug
Diffstat (limited to 'bundler.gemspec')
-rw-r--r--bundler.gemspec4
1 files changed, 4 insertions, 0 deletions
diff --git a/bundler.gemspec b/bundler.gemspec
index 05f5ccdaa4..a48fc18884 100644
--- a/bundler.gemspec
+++ b/bundler.gemspec
@@ -2,7 +2,11 @@
Gem::Specification.new do |s|
s.name = %q{bundler}
+<<<<<<< Updated upstream
s.version = "0.9.0.pre3"
+=======
+ s.version = "0.9.0.pre2"
+>>>>>>> Stashed changes
s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
s.authors = ["Carl Lerche", "Yehuda Katz"]